From patchwork Sun Feb 25 18:39:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 86344 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A2FD53858D3C for ; Sun, 25 Feb 2024 18:43:26 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0C4333858C5F for ; Sun, 25 Feb 2024 18:40:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0C4333858C5F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0C4333858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886431; cv=none; b=q5dnpqySmvf1Vf7F/0+qp+M/u+XLSOIlV6n11nPAYvj9F4EauH0VEynLRhwI1QApowU9IXCABLH1pmkQah8o9QFBsBFmFxAbQPdjFmqjJXd+15Tf5VDtR2y0q6748UvUL92rpeeY6uIL4YEYvUdke/Eo1zJjUyBQYlGFXKHE4YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886431; c=relaxed/simple; bh=QnORy/yvIL86qW2JqOsMTHluXtW8fyAZaE7x4KRxDZc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=VEnVlLXQGtZ3xcKQJbWSk+RKsQ9HfCcrxrWAltCf09WCpwoK2BFTFxpLWDP2JLVu4R0mVN2MgxQE9iOZfmebgSenf91rTChN0EzDjIC22RBd3vL5wcLsGgYmHDEv0GV9AZzDsAPOXUXdoJXyhg/Xtt/h5wJ0V8r9Qr+KZmr1LLc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDJSta4tpHQ4kzsZae6V8cmaXxjU0exhskAGS5FVYJQ=; b=AIO84JXxyjtZYDD3au0jzF2s2yPY8Df5vg+LrmTn4uBBe/tV/iUJZGrvX+na/p30d2/23k zYMys0w4mteOqBtvi08Zs2R8wZ743o4wbo66UGdpYJddXO2HsplX0BP31eAKTHD7SLUHng hi8cygonWv7E480TTodj4uYg/i4PY+4= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-383-X3ti_sYXOziSLeyE-3Rjmw-1; Sun, 25 Feb 2024 13:40:27 -0500 X-MC-Unique: X3ti_sYXOziSLeyE-3Rjmw-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-42e6baf78f7so20530691cf.0 for ; Sun, 25 Feb 2024 10:40:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886426; x=1709491226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mDJSta4tpHQ4kzsZae6V8cmaXxjU0exhskAGS5FVYJQ=; b=pB/VpoUwjbLMEnI+/+WoOjndgRI6IgB1GNo8CnYYjrORoKoh0pgY3XluOEeJVkM/TQ x6kziNKrk3lLqOCnYuLmGbU3IlnZV/b7+rR1syYS7b7V7IX2cCAsv2kU+PhjDrjdtjMI BYll7SsTiED6vD9IsUVi86XS+e83PMuAWyjXtOPtnnud9V38vAY+aoSKZPde9GIhYafI ENWWggRKYyZ7wRD6efWQizzeeSxkEDSivFvU2dTtyWNi2RHVb6Ya69eDaONp+W9TgxDK QGtmyY5/oJnpXrz7+fjnn1Bo6S9q1ylslPY/OBzi+AfFtf8t598hqOdSIxqm1uaVaDwc Uv8w== X-Gm-Message-State: AOJu0Yxbu9bejxuLXu6+pkUICvEA2HdrUxU2KemNa91+CSQv4592U56x AeKRYTdLXeDF75IAoPU6zKL2na0cXLdn5Ib4+UZy1PT8IJ0P2Au28lQPrdEMhVcZ5JStdNb+0PM 6y9RQzB1hENgRBx7MlP+uqUO/Scrz5BNRpaCIYNjDhsKpUxYkHTu8ad3+ZuBiBS2RXmO9vSDhQT cqSjVb7w3CoIhOaxAwj419gPhjpELC+a74AcgNwTU= X-Received: by 2002:ac8:5f11:0:b0:42d:dab2:c283 with SMTP id x17-20020ac85f11000000b0042ddab2c283mr5787064qta.39.1708886426536; Sun, 25 Feb 2024 10:40:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0JVXFGrIvj4cSjNYH1H0EUUlpd63r+EJS5KtGuNphZkAd3fC1EomkhJFo/iC3SkL+o64pPg== X-Received: by 2002:ac8:5f11:0:b0:42d:dab2:c283 with SMTP id x17-20020ac85f11000000b0042ddab2c283mr5787046qta.39.1708886426176; Sun, 25 Feb 2024 10:40:26 -0800 (PST) Received: from localhost.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id y8-20020ac87088000000b0042e6ad88de0sm1643975qto.73.2024.02.25.10.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:24 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 10/10] hurd: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:49 -0500 Message-ID: <20240225183956.2534939-10-carlos@redhat.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240225183956.2534939-1-carlos@redhat.com> References: <20240225183956.2534939-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_WEB, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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. --- 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