From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2191) id DD1363858403; Sun, 25 Feb 2024 18:43:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD1363858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1708886583; bh=tR20xV77h6ntTGZp9BBQQqBBgkA2CfniEgxNLhCTtWY=; h=From:To:Subject:Date:From; b=xnQdZsAWXltVjW024YtZcPaF6VyfCM4p4JFX4nhG8qT0QF5u+4f2ieYxyAQ3BJpex A9Gz6IHc6PyivBlMTL3PrKRSdZJ125SXTvGsqMLeotQFR9HsfIjfr9qzvHCe2AdTIO G5cJ7KOxX2tCHa7ugyGko4YJ+Gc10xKDYF5HLr9Y= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Carlos O'Donell To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Reformat Makefile. X-Act-Checkin: glibc X-Git-Author: Carlos O'Donell X-Git-Refname: refs/heads/master X-Git-Oldrev: 5420d211f057d26d6d42724dd13c5b43fdd7a9a3 X-Git-Newrev: f31d677fd69fb68c8b7a3c4cdaa6e9a1bd46d6a4 Message-Id: <20240225184303.DD1363858403@sourceware.org> Date: Sun, 25 Feb 2024 18:43:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f31d677fd69fb68c8b7a3c4cdaa6e9a1bd46d6a4 commit f31d677fd69fb68c8b7a3c4cdaa6e9a1bd46d6a4 Author: Carlos O'Donell Date: Fri Jun 9 17:46:34 2023 -0400 hurd: Reformat Makefile. Reflow and sort Makefile. Code generation changes present due to link order changes. No regressions on x86_64 and i686. Tested with build-many-glibcs.py for x86_64-gnu. Diff: --- hurd/Makefile | 171 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 129 insertions(+), 42 deletions(-) diff --git a/hurd/Makefile b/hurd/Makefile index 7138e3a6ae..bf1636adec 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -19,51 +19,138 @@ subdir := hurd include ../Makeconfig -headers = hurd.h $(interface-headers) \ - $(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\ - userlink.h resource.h lookup.h) - -inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \ - userlink.h port.h) +headers = \ + $(interface-headers) \ + hurd.h \ + hurd/fd.h \ + hurd/id.h \ + hurd/ioctl.h \ + hurd/lookup.h \ + hurd/port.h \ + hurd/resource.h \ + hurd/signal.h \ + hurd/sigpreempt.h \ + hurd/userlink.h \ + # headers + +inline-headers = \ + hurd.h \ + hurd/fd.h \ + hurd/port.h \ + hurd/signal.h \ + hurd/userlink.h \ + # inline-headers # The RPC interfaces go in a separate library. interface-library := libhurduser -user-interfaces := $(addprefix hurd/,\ - auth startup \ - process process_request \ - msg msg_reply msg_request \ - exec exec_startup crash interrupt \ - fs fsys io io_reply io_request \ - term tioctl socket ifsock \ - login password pfinet pci \ - ) -server-interfaces := hurd/msg faultexc - -routines = hurdstartup hurdinit \ - hurdid hurdpid hurdrlimit hurdprio hurdexec hurdselect \ - hurdlookup lookup-retry lookup-at \ - get-host set-host \ - path-lookup \ - setauth \ - pid2task task2pid \ - geteuids seteuids getumask fchroot \ - hurdsock hurdauth \ - hurdchdir hurdfchdir \ - privports \ - msgportdemux \ - fopenport \ - vpprintf \ - ports-get ports-set hurdports hurdmsg \ - errno-loc \ - hurdlock \ - $(sig) $(dtable) $(inlines) \ - fd-cleanup port-cleanup report-wait xattr -sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \ - trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \ - thread-self thread-cancel intr-msg catch-signal -dtable = dtable port2fd new-fd alloc-fd intern-fd \ - getdport openport \ - fd-close fd-read fd-write hurdioctl ctty-input ctty-output +user-interfaces := \ + hurd/auth \ + hurd/crash \ + hurd/exec \ + hurd/exec_startup \ + hurd/fs \ + hurd/fsys \ + hurd/ifsock \ + hurd/interrupt \ + hurd/io \ + hurd/io_reply \ + hurd/io_request \ + hurd/login \ + hurd/msg \ + hurd/msg_reply \ + hurd/msg_request \ + hurd/password \ + hurd/pci \ + hurd/pfinet \ + hurd/process \ + hurd/process_request \ + hurd/socket \ + hurd/startup \ + hurd/term \ + hurd/tioctl \ + # user-interfaces + +server-interfaces := \ + faultexc \ + hurd/msg \ + # server-interfaces + +routines = \ + $(dtable) \ + $(inlines) \ + $(sig) \ + errno-loc \ + fchroot \ + fd-cleanup \ + fopenport \ + get-host \ + geteuids \ + getumask \ + hurdauth \ + hurdchdir \ + hurdexec \ + hurdfchdir \ + hurdid \ + hurdinit \ + hurdlock \ + hurdlookup \ + hurdmsg \ + hurdpid \ + hurdports \ + hurdprio \ + hurdrlimit \ + hurdselect \ + hurdsock \ + hurdstartup \ + lookup-at \ + lookup-retry \ + msgportdemux \ + path-lookup \ + pid2task \ + port-cleanup \ + ports-get \ + ports-set \ + privports \ + report-wait \ + set-host \ + setauth \ + seteuids \ + task2pid \ + vpprintf \ + xattr \ + # routines +sig = \ + catch-exc \ + catch-signal \ + exc2signal \ + hurd-raise \ + hurdfault \ + hurdkill \ + hurdsig \ + intr-msg \ + longjmp-ts \ + preempt-sig \ + siginfo \ + sigunwind \ + thread-cancel \ + thread-self \ + trampoline \ + # sig +dtable = \ + alloc-fd \ + ctty-input \ + ctty-output \ + dtable \ + fd-close \ + fd-read \ + fd-write \ + getdport \ + hurdioctl \ + intern-fd \ + new-fd \ + openport \ + port2fd \ + # dtable inlines = $(inline-headers:%.h=%-inlines) # XXX this is a temporary hack; see hurdmalloc.h