From patchwork Sun Feb 25 18:39:40 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: 86335 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 ECE033858C56 for ; Sun, 25 Feb 2024 18:40:46 +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 106783858C5E for ; Sun, 25 Feb 2024 18:40:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 106783858C5E 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 106783858C5E 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=1708886415; cv=none; b=WgmqQ6g1nGvtaxv/DEpxM4gd4wJQfPLpKqUrZvpYxq8Yg1LZaMuTTgfghI/fVyqUc8qv6kjO+JmGLM78gUCwMbbn53BjL0+q7griUytwviI6eSZezLQjRRoTArentvYZJuNYXyoda31Q3jeQIcfzcv1TjK8rAnwHqiGqfw/sEVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886415; c=relaxed/simple; bh=89GAFP2djbEVpOiFbvbETo33+61SYEmbfxVUQnUS0h8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OfsLnvNF3ekSQQ0FQLtl4JsCVIu+4s6g7nbuLPD/ZOYgpxNgi9T7yVtv5ZepGGRcc/Fgf1EqTkUGh7kqV4s1W+/LmU6g5sGwr7h3SqDGLEJSQdxYHX5AwLWyfMEqggB47fc333UfUFrfWzT6yLCWRu5TB0kIKdyW1BMou1r29W4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886412; 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; bh=nchjeLAPmtCrDiDLK5ZVPJsx1w1K585FyFrn0QYfBms=; b=QEaMUuIwFVHuVauRSvq+BjOnF7neyR0c9SDWiMa44MP5caWnOOSBT34InJc4SPFDDc4D6r 3O+v6+XC/Ib43YZBUWR+Oh7zR9FkLURK9FR9BrsDzMxlRuJt04JB/Aw2o4Z//+vdxyGVvT i5JUXakB0CoGeIEJBaoZ1PM4+Ll8U0o= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-RT9bbTMlMKqlfbG-8GcYpg-1; Sun, 25 Feb 2024 13:40:11 -0500 X-MC-Unique: RT9bbTMlMKqlfbG-8GcYpg-1 Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-3c19b82746eso568036b6e.3 for ; Sun, 25 Feb 2024 10:40:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886410; x=1709491210; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nchjeLAPmtCrDiDLK5ZVPJsx1w1K585FyFrn0QYfBms=; b=MOdyu6Q0+7lXczpy0g8aBbKtlGKkA4XFVOWyU8sK8e2AQtCUNFPVD8VtuMKSpgw8q7 0tX6dIxvpaoApYYkRGiqW/7ELxYeR2qEsLIZ37Tob43tQrOu+VuhqKYHOlHFqQqyryKM ivukLYyWyhvk3L346gJNTRkL9ZF68dam+QL6o54IRVCWqZRafvTf3TGo+NcHhP84fvyn NglxO63o2qzcJXD6k0NC/e22CT5hNw5OCg+17WMXTbxUbtOUDB5ePQwbHYz0ICQvNoSq 9ESJiH3qvlPMaqhx443jAYqw9GyLrUS5qFAVJYh37kBxkOyjB8Z2fIGFCW7jbGPlnRBj 2B4g== X-Gm-Message-State: AOJu0YzVHyd14flKKR0zXomQhGKL+CoQ8jJ22nQy4bI8uKpm5M3bGcR7 VGHEyrGKAR1PuVDN3xwmb+8bmAde++fFjcxFubf/gNRrpvFqQduf+c+6EVsmr2WPadQk/MHJM0C YJaiMEirxDXssOm3tYedrsl3VG1HjYIltqpUqO4ewqc7KBpn0Iad2oxgdgyKD6/6cZOSTFaqUqn Wl4T9IR7idJXY+29SAJiWdXTFpymJwgKVbAz3VyXs= X-Received: by 2002:a05:6808:201b:b0:3c1:5557:453d with SMTP id q27-20020a056808201b00b003c15557453dmr6985740oiw.27.1708886410016; Sun, 25 Feb 2024 10:40:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUtV3lZRqyAwGKEu2Ty+ko3kidCoP+IVun6MIfI68dtLsyNmBiB/DGwgYQhskbKhAfUe96iw== X-Received: by 2002:a05:6808:201b:b0:3c1:5557:453d with SMTP id q27-20020a056808201b00b003c15557453dmr6985725oiw.27.1708886409527; Sun, 25 Feb 2024 10:40:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:08 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 01/10] conform: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:40 -0500 Message-ID: <20240225183956.2534939-1-carlos@redhat.com> X-Mailer: git-send-email 2.43.2 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. No code changes in generated binary artifacts. No regressions on x86_64 and i686. --- conform/Makefile | 344 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 278 insertions(+), 66 deletions(-) diff --git a/conform/Makefile b/conform/Makefile index b067cdf83b..73a3cb6da2 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -25,78 +25,290 @@ include ../Makeconfig conformtest-headers-data := $(wildcard data/*.h-data) \ $(wildcard data/*/*.h-data) -conformtest-standards := ISO ISO99 ISO11 POSIX XPG4 XPG42 UNIX98 XOPEN2K \ - POSIX2008 XOPEN2K8 - -conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \ - math.h setjmp.h signal.h stdarg.h stddef.h stdio.h \ - stdlib.h string.h time.h -conformtest-headers-ISO99 := $(conformtest-headers-ISO) complex.h fenv.h \ - inttypes.h iso646.h stdbool.h stdint.h tgmath.h \ - wchar.h wctype.h +conformtest-standards := \ + ISO \ + ISO11 \ + ISO99 \ + POSIX \ + POSIX2008 \ + UNIX98 \ + XOPEN2K \ + XOPEN2K8 \ + XPG4 \ + XPG42 \ + # conformtest-standards +conformtest-headers-ISO := \ + assert.h \ + ctype.h \ + errno.h \ + float.h \ + limits.h \ + locale.h \ + math.h \ + setjmp.h \ + signal.h \ + stdarg.h \ + stddef.h \ + stdio.h \ + stdlib.h \ + string.h \ + time.h \ + # conformtest-headers-ISO +conformtest-headers-ISO99 := \ + $(conformtest-headers-ISO) \ + complex.h \ + fenv.h \ + inttypes.h \ + iso646.h \ + stdbool.h \ + stdint.h \ + tgmath.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-ISO99 # Missing ISO11 expectations for: stdatomic.h -conformtest-headers-ISO11 := $(conformtest-headers-ISO99) stdalign.h \ - stdnoreturn.h threads.h uchar.h -conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \ - fcntl.h fnmatch.h glob.h grp.h mqueue.h \ - pthread.h pwd.h regex.h sched.h semaphore.h \ - sys/mman.h sys/stat.h sys/times.h sys/types.h \ - sys/utsname.h sys/wait.h tar.h termios.h \ - unistd.h utime.h wordexp.h +conformtest-headers-ISO11 := \ + $(conformtest-headers-ISO99) \ + stdalign.h \ + stdnoreturn.h \ + threads.h \ + uchar.h \ + # conformtest-headers-ISO11 +conformtest-headers-POSIX := \ + $(conformtest-headers-ISO) \ + aio.h \ + dirent.h \ + fcntl.h \ + fnmatch.h \ + glob.h \ + grp.h \ + mqueue.h \ + pthread.h \ + pwd.h \ + regex.h \ + sched.h \ + semaphore.h \ + sys/mman.h \ + sys/stat.h \ + sys/times.h \ + sys/types.h \ + sys/utsname.h \ + sys/wait.h \ + tar.h \ + termios.h \ + unistd.h \ + utime.h \ + wordexp.h \ + # conformtest-headers-POSIX # Missing XPG4 expectations for: regexp.h wchar.h. -conformtest-headers-XPG4 := $(conformtest-headers-ISO) cpio.h dirent.h \ - fcntl.h fnmatch.h ftw.h glob.h grp.h iconv.h \ - langinfo.h monetary.h nl_types.h pwd.h regex.h \ - search.h sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \ - sys/stat.h sys/times.h sys/types.h sys/utsname.h \ - sys/wait.h tar.h termios.h ulimit.h unistd.h \ - utime.h varargs.h wordexp.h -# Missing XPG42 expectations for: re_comp.h regexp.h wchar.h. +conformtest-headers-XPG4 := \ + $(conformtest-headers-ISO) \ + cpio.h \ + dirent.h \ + fcntl.h \ + fnmatch.h \ + ftw.h \ + glob.h \ + grp.h \ + iconv.h \ + langinfo.h \ + monetary.h \ + nl_types.h \ + pwd.h \ + regex.h \ + search.h \ + sys/ipc.h \ + sys/msg.h \ + sys/sem.h \ + sys/shm.h \ + sys/stat.h \ + sys/times.h \ + sys/types.h \ + sys/utsname.h \ + sys/wait.h \ + tar.h \ + termios.h \ + ulimit.h \ + unistd.h \ + utime.h \ + varargs.h \ + wordexp.h \ + # conformtest-headers-XPG4 +# Missing XPG42 expectations for: +# re_comp.h +# regexp.h +# wchar.h # XPG42 includes XTI and STREAMS, but those are not implemented by glibc. -conformtest-headers-XPG42 := $(conformtest-headers-XPG4) arpa/inet.h fmtmsg.h \ - libgen.h ndbm.h netdb.h netinet/in.h poll.h \ - strings.h sys/mman.h sys/resource.h \ - sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h \ - sys/uio.h sys/un.h syslog.h ucontext.h utmpx.h -# Missing UNIX98 expectations for: inttypes.h re_comp.h regexp.h. +conformtest-headers-XPG42 := \ + $(conformtest-headers-XPG4) \ + arpa/inet.h \ + fmtmsg.h \ + libgen.h \ + ndbm.h \ + netdb.h \ + netinet/in.h \ + poll.h \ + strings.h \ + sys/mman.h \ + sys/resource.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + ucontext.h \ + utmpx.h \ + # conformtest-headers-XPG42 +# Missing UNIX98 expectations for: +# inttypes.h +# re_comp.h +# regexp.h # The online UNIX98 includes XCURSES, but curses.h, term.h and # unctrl.h are outside the scope of these tests. It also includes # XTI and STREAMS, but those are not implemented by glibc. -conformtest-headers-UNIX98 := $(conformtest-headers-POSIX) arpa/inet.h cpio.h \ - dlfcn.h fmtmsg.h ftw.h iconv.h iso646.h \ - langinfo.h libgen.h monetary.h ndbm.h netdb.h \ - netinet/in.h nl_types.h poll.h search.h \ - strings.h sys/ipc.h sys/msg.h \ - sys/resource.h sys/sem.h sys/shm.h sys/socket.h \ - sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \ - sys/un.h syslog.h ucontext.h ulimit.h utmpx.h \ - varargs.h wchar.h wctype.h -# Missing XOPEN2K expectations for: trace.h, stropts.h. -conformtest-headers-XOPEN2K := $(conformtest-headers-POSIX) arpa/inet.h \ - complex.h cpio.h dlfcn.h fenv.h fmtmsg.h ftw.h \ - iconv.h inttypes.h iso646.h langinfo.h \ - libgen.h monetary.h ndbm.h net/if.h netdb.h \ - netinet/in.h netinet/tcp.h nl_types.h poll.h \ - search.h spawn.h stdbool.h stdint.h strings.h \ - sys/ipc.h sys/msg.h sys/resource.h \ - sys/select.h sys/sem.h sys/shm.h sys/socket.h \ - sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \ - sys/un.h syslog.h tgmath.h ucontext.h ulimit.h \ - utmpx.h wchar.h wctype.h -# Missing POSIX2008 expectations for: trace.h, stropts.h. -conformtest-headers-POSIX2008 := $(conformtest-headers-POSIX) arpa/inet.h \ - complex.h cpio.h dlfcn.h fenv.h iconv.h \ - inttypes.h iso646.h langinfo.h monetary.h \ - net/if.h netdb.h netinet/in.h netinet/tcp.h \ - nl_types.h poll.h spawn.h stdbool.h stdint.h \ - strings.h sys/select.h \ - sys/socket.h sys/statvfs.h sys/un.h tgmath.h \ - wchar.h wctype.h -# Missing XOPEN2K8 expectations for: trace.h. -conformtest-headers-XOPEN2K8 := $(conformtest-headers-POSIX2008) fmtmsg.h \ - ftw.h libgen.h ndbm.h search.h sys/ipc.h \ - sys/msg.h sys/resource.h sys/sem.h sys/shm.h \ - sys/time.h sys/uio.h syslog.h ulimit.h utmpx.h +conformtest-headers-UNIX98 := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + cpio.h \ + dlfcn.h \ + fmtmsg.h \ + ftw.h \ + iconv.h \ + iso646.h \ + langinfo.h \ + libgen.h \ + monetary.h \ + ndbm.h \ + netdb.h \ + netinet/in.h \ + nl_types.h \ + poll.h \ + search.h \ + strings.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + ucontext.h \ + ulimit.h \ + utmpx.h \ + varargs.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-UNIX98 +# Missing XOPEN2K expectations for: +# trace.h +# stropts.h +conformtest-headers-XOPEN2K := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + complex.h \ + cpio.h \ + dlfcn.h \ + fenv.h \ + fmtmsg.h \ + ftw.h \ + iconv.h \ + inttypes.h \ + iso646.h \ + langinfo.h \ + libgen.h \ + monetary.h \ + ndbm.h \ + net/if.h \ + netdb.h \ + netinet/in.h \ + netinet/tcp.h \ + nl_types.h \ + poll.h \ + search.h \ + spawn.h \ + stdbool.h \ + stdint.h \ + strings.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/select.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + tgmath.h \ + ucontext.h \ + ulimit.h \ + utmpx.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-XOPEN2K +# Missing POSIX2008 expectations for: +# trace.h +# stropts.h +conformtest-headers-POSIX2008 := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + complex.h \ + cpio.h \ + dlfcn.h \ + fenv.h \ + iconv.h \ + inttypes.h \ + iso646.h \ + langinfo.h \ + monetary.h \ + net/if.h \ + netdb.h \ + netinet/in.h \ + netinet/tcp.h \ + nl_types.h \ + poll.h \ + spawn.h \ + stdbool.h \ + stdint.h \ + strings.h \ + sys/select.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/un.h \ + tgmath.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-POSIX2008 +# Missing XOPEN2K8 expectations for: +# trace.h +conformtest-headers-XOPEN2K8 := \ + $(conformtest-headers-POSIX2008) \ + fmtmsg.h \ + ftw.h \ + libgen.h \ + ndbm.h \ + search.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/sem.h \ + sys/shm.h \ + sys/time.h \ + sys/uio.h \ + syslog.h \ + ulimit.h \ + utmpx.h \ + # conformtest-headers-XOPEN2K8 conformtest-header-list-base := $(foreach std,$(conformtest-standards),\ header-list-$(std).out) From patchwork Sun Feb 25 18:39:41 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: 86336 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 50D573858429 for ; Sun, 25 Feb 2024 18:40:49 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id E60BB3858D1E for ; Sun, 25 Feb 2024 18:40:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E60BB3858D1E 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 E60BB3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886416; cv=none; b=C0+psyqphTU2Al/FgdkBv9Zkj6BubiIWCHK6jbbsdFYp+pWRxUqqTRrD6KktEOCCymjSoga92iBlc61UceHlxiDTm64N+ACoNHzCsAi84vgEJznHATW5Zt9k5qBmkREw+vfyIsEELqQ+e/J+ElmF+WHYsXxESfrY7Oe9ejP57eQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886416; c=relaxed/simple; bh=oojYM2x7s3IMdSBtvGNvVNlPq/iAU+W2oFhaH6T0bsg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KxNdHBjS+GEdZ6b8D9I05v9ls7xu6bKRyPdYWvV3O4lzGAFHMnTs5jQskHF+odyC+VG3iZahTOvZQxR8fDrHobUtts5aCylTiNnx8AjPF5Cjsk4eYciaFLAJaxM0FAl/qAHzeBpkwDP1PrC/qOkeZ2bLYRn2NASsGI4tmAUHtd4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886414; 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=v7wQ//V4rGFdSHlBT0L9db39FX+BjIsQzCEvAyzPrks=; b=anbwLNpDSdS1gmIiIUP4MWEzlE6aQM8s6eKJ9DOuX4M+rOVG97sLetoh7+8GxhS7p1Wwmk 5HJbRAcoAusGTg6CP5NTccmhBdwBHGJN90BCnfJpdD05hGLnHVMgGqwlvPeUNoeRknhjN5 G9D3qjH90EJRalzYZfArW26HEx/NOo0= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-r8yzw8umOyODP1sc-1CiAA-1; Sun, 25 Feb 2024 13:40:13 -0500 X-MC-Unique: r8yzw8umOyODP1sc-1CiAA-1 Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-3c031a2debdso2797959b6e.2 for ; Sun, 25 Feb 2024 10:40:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886412; x=1709491212; 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=v7wQ//V4rGFdSHlBT0L9db39FX+BjIsQzCEvAyzPrks=; b=e4pb2kRQHt4UNbeTm/vnsUM2LWRJzy1Hq0y2lTStSXjAWCfJewq6G7DB/w2Cnea7Qx 4BR8rp9VQKIVZHECv80EqoY4QP/kcTaGApENzIDQ7e6ily0/UVhgJzVNrTOBuBzp2EYh OEWVWXQQLq87cCQM70iMGQyaCQhRRVWRBdyIY9S3/k2ktj/Zt4/WfwIKbRhVaeT6Gzjs FR290kxavjvJ7jT4P5Kq4uxHee2WwH7l0KX3gHXy/aipEs+NpDyDjCGn/R+EwMr6mKsp WWwfB/BkgfH/P6JU+zx3DFJG6rN3xcbJEgJiNqFVQNhG7b1LWyeAUJX1HFMkOntxigj6 LH2A== X-Gm-Message-State: AOJu0Yxyauj7pJVdkwMjs5VigJHcVzueM8/DKSGGSn1A3H2S/yM8JNR3 6Yp9IAqXnXjQB73ZbHDK0iKPT9Eb5Xhjf9jJwEBQhCltP90hKNf8eMi5sVHMhAK/2NPPHMml5x9 REOG6wneA/2lK33adcN6l7RVDZ0GVae4/EiodvyXnbybeOro9f6cpT+dYeFBRxtK4KcQyVk+bDu J0FBv/lmAERMrjK1Fq3kAb6cJVg7AkHVnybay158Y= X-Received: by 2002:a05:6808:188f:b0:3c1:5c16:71bd with SMTP id bi15-20020a056808188f00b003c15c1671bdmr7527700oib.43.1708886411967; Sun, 25 Feb 2024 10:40:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvVxMLJMPxvDY1m6d9LgxN8l36ssD+OMwnTxZtK2WoFHhnVO1Ae8Er90cGiRuxT2F2oi2zJw== X-Received: by 2002:a05:6808:188f:b0:3c1:5c16:71bd with SMTP id bi15-20020a056808188f00b003c15c1671bdmr7527681oib.43.1708886411653; Sun, 25 Feb 2024 10:40:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:11 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 02/10] csu: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:41 -0500 Message-ID: <20240225183956.2534939-2-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=-12.4 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_H4, RCVD_IN_MSPIKE_WL, 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. --- csu/Makefile | 74 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/csu/Makefile b/csu/Makefile index ac05ab24d5..946fd91031 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -26,20 +26,36 @@ subdir := csu include ../Makeconfig -routines = init-first libc-start $(libc-init) sysdep version check_fds \ - libc-tls dso_handle +routines = \ + $(libc-init) \ + check_fds \ + dso_handle \ + init-first \ + libc-start \ + libc-tls \ + sysdep \ + version \ + # routines aux = errno elide-routines.os = libc-tls csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o) -extra-objs = start.o \ - $(start-installed-name) g$(start-installed-name) $(csu-dummies) \ - S$(start-installed-name) +extra-objs = \ + $(csu-dummies) \ + $(start-installed-name) \ + S$(start-installed-name) \ + g$(start-installed-name) \ + start.o \ + # extra-objs omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \ b$(start-installed-name) $(csu-dummies) \ S$(start-installed-name) \ r$(start-installed-name) \ gr$(start-installed-name)) -install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies) +install-lib = \ + $(csu-dummies) \ + $(start-installed-name) \ + g$(start-installed-name) \ + # install-lib # No tests are allowed in the csu/ subdirectory because the startup # code is compiled with special flags. @@ -67,7 +83,10 @@ CFLAGS-.os += $(call elide-stack-protector,.os,$(filter-out \ $(routines) $(extra-no-ssp))) ifeq (yes,$(build-shared)) -extra-objs += S$(start-installed-name) gmon-start.os +extra-objs += \ + S$(start-installed-name) \ + gmon-start.os \ + # extra-objs ifneq ($(start-installed-name),$(static-start-installed-name)) extra-objs += gmon-start.o endif @@ -78,20 +97,38 @@ extra-objs += gmon-start.o endif ifeq (yes,$(enable-static-pie)) -extra-objs += r$(start-installed-name) gr$(start-installed-name) -install-lib += r$(start-installed-name) gr$(start-installed-name) +extra-objs += \ + gr$(start-installed-name) \ + r$(start-installed-name) \ + # extra-objs +install-lib += \ + gr$(start-installed-name) \ + r$(start-installed-name) \ + # install-lib endif ifneq ($(start-installed-name),$(static-start-installed-name)) -extra-objs += $(static-start-installed-name) g$(static-start-installed-name) +extra-objs += \ + $(static-start-installed-name) \ + g$(static-start-installed-name) \ + # extra-objs omit-deps += $(patsubst %.o,%,$(static-start-installed-name) \ g$(static-start-installed-name)) -install-lib += $(static-start-installed-name) g$(static-start-installed-name) +install-lib += \ + $(static-start-installed-name) \ + g$(static-start-installed-name) \ + # install-lib ifeq (yes,$(enable-static-pie)) -extra-objs += r$(static-start-installed-name) gr$(static-start-installed-name) +extra-objs += \ + gr$(static-start-installed-name) \ + r$(static-start-installed-name) \ + # extra-objs omit-deps += $(patsubst %.o,%,r$(static-start-installed-name) \ gr$(static-start-installed-name)) -install-lib += r$(static-start-installed-name) gr$(static-start-installed-name) +install-lib += \ + gr$(static-start-installed-name) \ + r$(static-start-installed-name) \ + # install-lib endif endif @@ -104,7 +141,10 @@ gen-as-const-headers += rtld-sizes.sym # These are the special initializer/finalizer files. They are always the # first and last file in the link. crti.o ... crtn.o define the global # "functions" _init and _fini to run the .init and .fini sections. -crtstuff = crti crtn +crtstuff = \ + crti \ + crtn \ + # crtstuff install-lib += $(crtstuff:=.o) extra-objs += $(crtstuff:=.o) @@ -114,7 +154,11 @@ multilib-extra-objs = $(addprefix $(multidir)/, $(install-lib)) extra-objs += $(multilib-extra-objs) endif -extra-objs += abi-note.o init.o static-reloc.o +extra-objs += \ + abi-note.o \ + init.o \ + static-reloc.o \ + # extra-objs ifeq (yes,$(build-shared)) extra-objs += static-reloc.os endif From patchwork Sun Feb 25 18:39:42 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: 86337 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 9EB953858C56 for ; Sun, 25 Feb 2024 18:41:08 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id DE4F63858CDB for ; Sun, 25 Feb 2024 18:40:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE4F63858CDB 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 DE4F63858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886417; cv=none; b=u3W7dQAUZ7j50j8Z5IQY8piJRhmofDu1TGUuOvqrTcawArE5piBIM7aVCfE6UOt/57X61XRStTiJXgDGYjCKvfTDlrZcloLwPsjZSolewtbz+cTWZBCSUWWYWV9THSCYFxD6yYmn4ArtU3EzVHtm2WmuqB5mKB01aTNxUEMKex0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886417; c=relaxed/simple; bh=EkrsD0IQ5VjwUOgVXaN64kUoM82SRDWewBFocUv/aXM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xIhT1wOhiDSJLl0GQnN/3u4YNsewvb4jgN/yhDi+Sje9Ih+wcYg/XuPFAmahIW8c8Y1njjvs2/T3NeJptf/0dvEzQhSaZAxQ9tb1TzWmT5kceelQlWhgKdvaUFfCF643dRhvY6hnre56lwuZ4GG9CLHuOWyN4llahYFDxieLWgk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886415; 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=mFOvsLvic3HjNvwieKI5WA7GUJ7VP/m4ay04pk51zR4=; b=iLWKBgt+UqoOljAD2VnORATepg6bt7bZcQH+mvuBeU0YEtzqrN9aKtUN1AGRIgINHQ96yK 7EscjNBcAvBwG6c5tcZz+D9HAibW6njzBzjqeIMvKGe1RMNFF7gCiSfjlYdaF9KDmseq8i MVjW8ljwQcP5vsuV0hiJS9k/Jxjr2fQ= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-630-PFQ_QkYCOFycFWcIHq9K7A-1; Sun, 25 Feb 2024 13:40:14 -0500 X-MC-Unique: PFQ_QkYCOFycFWcIHq9K7A-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-42e2506ac53so43278251cf.0 for ; Sun, 25 Feb 2024 10:40:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886413; x=1709491213; 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=mFOvsLvic3HjNvwieKI5WA7GUJ7VP/m4ay04pk51zR4=; b=FClxX20QDlF0ZYo05ph6vFwnwKf1P1pYyIS4RTiLfG41Gjhv+R7BMNOv9EYwcQqduh wLo3lvkzOvtxHHH/jsUwRHmYAvaj15uULHolu4O0/VN/DeBgio6qCr6ziV+UWV6WW0Fi OIu27U2oel2U9kFBwdnT4ZP0hcjaBZPwXumotZ6oJVist48Rqpz7YjqKO/NA/p7ghsJf AsSMxQiZKb4ejFwU9RBGBHa38RFVVzlcz+hb+vqAxaZ+71W2mWxhVT1mWhchAckhqhgt AXbCW3Si3NXbTl/pKYggMLsA0t8w4WYAJ0T6gwOir+LIAhsGgVDT1YV4mAOfhkfpCezK FDFQ== X-Gm-Message-State: AOJu0YxIlx413fyHtelf7Dl+PPLplQ2VhMkjbuo+2dbpBksIunqy4mDK YK8rQfY6f4wVfcFJ0STSjYyZQZ+q1cYutTuKMOlY7EOX4JOkxT192FDtG7/ygFPHCxGkMcKFB9Q uD2wNJJtZpZeu1ozBRcd3442DqUKWWlinlJLTtZiXdnj3+2aE28b1Vq7lmRPePyUk36JcndnuQw JMZYEMANJGXKwuYgmJWzSH1ySI0oaxpeqybjrGTjc= X-Received: by 2002:a05:622a:1186:b0:42e:687c:e9c1 with SMTP id m6-20020a05622a118600b0042e687ce9c1mr6565367qtk.19.1708886413461; Sun, 25 Feb 2024 10:40:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvc0Qh7H2oHfWTa806pjLfFaNttG90mCTjK7WNl5YIkqPwNvcnz0T/giD+o9uzhFTC3Wks9g== X-Received: by 2002:a05:622a:1186:b0:42e:687c:e9c1 with SMTP id m6-20020a05622a118600b0042e687ce9c1mr6565354qtk.19.1708886413217; Sun, 25 Feb 2024 10:40:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:12 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 03/10] ctype: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:42 -0500 Message-ID: <20240225183956.2534939-3-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=-12.4 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_H4, RCVD_IN_MSPIKE_WL, 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. --- ctype/Makefile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ctype/Makefile b/ctype/Makefile index 717d020129..3e09938bd1 100644 --- a/ctype/Makefile +++ b/ctype/Makefile @@ -24,9 +24,18 @@ include ../Makeconfig headers := ctype.h -routines := ctype ctype-c99 ctype-extn ctype-c99_l ctype_l isctype -aux := ctype-info - -tests := test_ctype +routines := \ + ctype \ + ctype-c99 \ + ctype-c99_l \ + ctype-extn \ + ctype_l \ + isctype \ + # routines +aux := ctype-info + +tests := \ + test_ctype \ + # tests include ../Rules From patchwork Sun Feb 25 18:39:43 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: 86338 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 3A62B3858433 for ; Sun, 25 Feb 2024 18:41:19 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 6C3713858C60 for ; Sun, 25 Feb 2024 18:40:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C3713858C60 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 6C3713858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886419; cv=none; b=A8wmtCA7PyoFeDMDn3c4Tp0rneho882nQpDDL5yU241nL8LwYRcqDKkErNDGFrK404iHCw0TMnRzSFHOlQljPJQh1EW+Zm2pU79OsXxpoJmM9XqpUhb1eq4jucCZc44UqCwbLFtSJiPNDAGzAlIoLQOX/ScU+2tmnv1iSP8jvGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886419; c=relaxed/simple; bh=ODK/m1oyUf26LOzMX6ibD6vfqVfs+sr7px+uEUd0kJk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=swkQ3UpihL6RvWwnpHAPKCExGCTN1n3/khf5e1XYyn/GZWOmDCnTaDsEsF1OlBpassGFbvd2MK0A2gzNZw2UUDX7hXZuBbO2qLK0Lr5rViq+d1El7fAOUiOKh3HOOjRTa6gsmrFpHIIQ2HtIlw3/BknELPX8qdg5663YE9Ade5k= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886417; 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=ZZWIIrTSM6guq912iS0Z/zw9HjAGhxMykZjWAOPwKIg=; b=O5J9XbEYul+q/a2x7qjnT5mlMU73AbQVcnRNl2MjIBZaO5yUd0h8RR+0cc0hzpYwfnc33X Df+uKcPTEBiXo4Qg4FuCljBZDcsFDsWqOXLnycUGGobP8jBAyErQKuabdMViNEBWomAtEZ 0b+tfdxN7xesnhNkrDVIG6jgHsXzjmU= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-248-Nz4xm4LEOfOtss5XU9MVqQ-1; Sun, 25 Feb 2024 13:40:15 -0500 X-MC-Unique: Nz4xm4LEOfOtss5XU9MVqQ-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42e4e9629f9so24699571cf.0 for ; Sun, 25 Feb 2024 10:40:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886415; x=1709491215; 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=ZZWIIrTSM6guq912iS0Z/zw9HjAGhxMykZjWAOPwKIg=; b=bXFtqEUmrsM2LlSbCDRXucTXTkwZKsYbSsbyPMsbNmcoaDK8vviS/8M7noaNalOvoU JZDr1qjD3oCd5d25auFuhZZvD4KxxjWKEJczo8n3m4tgeQKN4NWObXYgDCqKBX5vF6Qg UUFtqbDuS/1t+9fYaQ+5bYDj5Q7SerZ5HJy0ESLOA3b1aLBbsC0nri7e7Zuogx+v5m4e +TqibLEQ7XOKeojR2tg+OIbJrVeD0IQAkalSpfz11lKfK4ZiTVBzbG6YwlTYc6osIpcg ZuV9xFrBEZkIb0w3Ul2HM6cXVqK/3QsgR6pXopQBBdc1ajgvvqh8ap+5SkyJNeGJtRaz TFVw== X-Gm-Message-State: AOJu0YznDVS47X3VcP8+iWPYwy9cXr1aMdNXTVXXA4am48icdWtq7p1g dNOdUWC6EGtVIw0uQn1Qb8qCgIhE7zVD1fUhCX044YVK7UXwp/4ARxkaAxtmaU0QVA0Khtl0Iaf wPLbcLkZIxxoKKbKvT6bFxf0anf9ChtXymjdTPPxEvgz5FMJ2mAZG+AWREyG+DGoJ0dpFEyTSeb sBeQ5kofi+t/cYq/184ynJb4kKJpwdMyTsaCyPz4E= X-Received: by 2002:a05:622a:410:b0:42c:5d43:7e77 with SMTP id n16-20020a05622a041000b0042c5d437e77mr6229322qtx.7.1708886414970; Sun, 25 Feb 2024 10:40:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDJTuacgG5XTfOhY7SVD/LqsOnnIcL/vH1iytJzEhh3rFPD2vS6cx41VdsTpXVtB1I8j0wBw== X-Received: by 2002:a05:622a:410:b0:42c:5d43:7e77 with SMTP id n16-20020a05622a041000b0042c5d437e77mr6229303qtx.7.1708886414608; Sun, 25 Feb 2024 10:40:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:14 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 04/10] dirent: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:43 -0500 Message-ID: <20240225183956.2534939-4-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=-12.4 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_H4, RCVD_IN_MSPIKE_WL, 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. --- dirent/Makefile | 52 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/dirent/Makefile b/dirent/Makefile index 92587cab9a..556f759f65 100644 --- a/dirent/Makefile +++ b/dirent/Makefile @@ -22,16 +22,48 @@ subdir := dirent include ../Makeconfig -headers := dirent.h bits/dirent.h bits/dirent_ext.h -routines := opendir closedir readdir readdir_r rewinddir \ - seekdir telldir scandir alphasort versionsort \ - getdents getdents64 dirfd readdir64 readdir64_r scandir64 \ - alphasort64 versionsort64 fdopendir \ - scandirat scandirat64 \ - scandir-cancel scandir-tail scandir64-tail - -tests := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \ - tst-fdopendir2 tst-scandir tst-scandir64 +headers := \ + bits/dirent.h \ + bits/dirent_ext.h \ + dirent.h \ + # headers +routines := \ + alphasort \ + alphasort64 \ + closedir \ + dirfd \ + fdopendir \ + getdents \ + getdents64 \ + opendir \ + readdir \ + readdir64 \ + readdir64_r \ + readdir_r \ + rewinddir \ + scandir \ + scandir-cancel \ + scandir-tail \ + scandir64 \ + scandir64-tail \ + scandirat \ + scandirat64 \ + seekdir \ + telldir \ + versionsort \ + versionsort64 \ + # routines + +tests := \ + bug-readdir1 \ + list \ + opendir-tst1 \ + tst-fdopendir \ + tst-fdopendir2 \ + tst-scandir \ + tst-scandir64 \ + tst-seekdir \ + # tests CFLAGS-scandir.c += $(uses-callbacks) CFLAGS-scandir64.c += $(uses-callbacks) From patchwork Sun Feb 25 18:39:44 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: 86342 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 75B6D3858C42 for ; Sun, 25 Feb 2024 18:42:12 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 35E3C3858C98 for ; Sun, 25 Feb 2024 18:40:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 35E3C3858C98 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 35E3C3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886420; cv=none; b=fDu71iCPdUjEct95VqWj8DxXMhkzPdj2Vx71BJOJ6oyQgKKhAgw4G3Sbu6InVXS+vl5qI/a4kPmvcdhGXC5S31JsKM43uzmlT1QH+WebvjG4vNtjiNdteRF2wDzrQfxGpaanH0l0yoDv4IEcqHqF4xzxVoPwwasJp6M4lXwwDYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886420; c=relaxed/simple; bh=/Wsm4zoujOpP8jc31kruqJRQlaxdT2iVhV2xMy59GGY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=YNRX1JtOSgYs9zoiFPFqmqjgs/gLGb6pNwMqKpHZCBKHSPrXkCjBZojgvkHLAWPzpluK23m7bBA9GSOB7oqJd4revCe5dLq2jZ7BxP+1kygzMlfGdIBfOwL7SNxTrpgoHUXZxFqB5yS6EC4qny496LDV9Yon8Wsem524HCaqLEY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886419; 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=TQEbjk+kQQXbF0tnfwJ1g39hZB4aWbULbdzpIMxcYQI=; b=TgGNa/ovoDgq3vrXCjbTzC/BZWUVBbSlS7MOOS1rCVUFh35G+g/hR3xPhWY2OInDUwalPX C3MUwNFxzWv8fOJb9APKRR2tL13Z3ek6wD/Fh+TSz8GPHwSNalKlNvDZKTdfTYVEg9//XO et8Naf46N8tmWpUNoY1Eycau61k6O3c= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-UAOksAStMbqKNAmERrAZmQ-1; Sun, 25 Feb 2024 13:40:17 -0500 X-MC-Unique: UAOksAStMbqKNAmERrAZmQ-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42e7f946215so6918371cf.2 for ; Sun, 25 Feb 2024 10:40:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886416; x=1709491216; 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=TQEbjk+kQQXbF0tnfwJ1g39hZB4aWbULbdzpIMxcYQI=; b=ptk5IsKfdjZkDzkNjNc+/XhqkLD9I/oyXZ/QTxD/7tSp9q3jR8WlkOvOUPc+Vs5wlr CIogp/uBupy+tpyohoiUZKe1tC+zn8MeHtdthev+M+tEK5xU1/G3r1AvBfTesQf9Qc8X LRNPdWL1v2YR2JUgHk/RsRDwp8DSzkGEwCWcNqt8Ixnq0npzH/AHzMDjtqfQJLYX/zRy LU/xEXYYsBvXfXRUaDrPbWtKyemOweb4S5FW9KEdDC0FWPJYFKNKfKHZv3IfxsVLUXo1 QYKBRfg1baQNfEv6kegXumyXZRR8UQKFXaBlBHkj4X6GUdb3iBVbdjsArCdHK38mj/wt w6vA== X-Gm-Message-State: AOJu0Ywr/p7PTWJ2HBjNoF4hZUmy6C4AzpLk4NWK0LvkpMSgGRzo1HF8 aSh2qFS1QxABepP6CohhByZBMangk61ylTr3WER3wkygIhg9hmX2e/fg3Cf+96yhWjn+6XPpgby nVu8BYDEX4m41FnwUCgUBKD43hjtpIf02ZxOHOAaUPCiiDljhACnGZAFlJeZaBWSErSK+2bpcVH IGY2Z8umPxaEWEPtrfn1fFujSP5q96Hbv8lXmtRsU= X-Received: by 2002:a05:622a:1b9f:b0:42e:58c6:bc9e with SMTP id bp31-20020a05622a1b9f00b0042e58c6bc9emr5901320qtb.60.1708886416735; Sun, 25 Feb 2024 10:40:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuFhZTIj2wtDo1h6KhftpdKjbqvyvdRk1pZFn3l1HmOJKL6ThTqERyMWFdJc7I1PKGmiyVhA== X-Received: by 2002:a05:622a:1b9f:b0:42e:58c6:bc9e with SMTP id bp31-20020a05622a1b9f00b0042e58c6bc9emr5901308qtb.60.1708886416493; Sun, 25 Feb 2024 10:40:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:15 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 05/10] dlfcn: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:44 -0500 Message-ID: <20240225183956.2534939-5-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=-12.4 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_H4, RCVD_IN_MSPIKE_WL, 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. No code generation changes in non-test binary artifacts. No regressions on x86_64 and i686. --- dlfcn/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/dlfcn/Makefile b/dlfcn/Makefile index 6944fb3610..d473773dd4 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -19,7 +19,11 @@ subdir := dlfcn include ../Makeconfig -headers := bits/dlfcn.h bits/dl_find_object.h dlfcn.h +headers := \ + bits/dl_find_object.h \ + bits/dlfcn.h \ + dlfcn.h \ + # headers extra-libs := libdl libdl-routines := libdl-compat routines = \ @@ -33,6 +37,7 @@ routines = \ dlsym \ dlvsym \ libc_dlerror_result \ + # routines extra-libs-others := libdl @@ -49,24 +54,69 @@ shared-only-routines := dlopenold endif ifeq (yes,$(build-shared)) -tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \ - bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \ - bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen +tests = \ + bug-atexit1 \ + bug-atexit2 \ + bug-atexit3 \ + bug-dl-leaf \ + bug-dlopen1 \ + bug-dlsym1 \ + default \ + errmsg1 \ + failtest \ + glrefmain \ + tst-dladdr \ + tst-dlinfo \ + tst-rec-dlopen \ + tstatexit \ + tstcxaatexit \ + # tests endif -modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \ - defaultmod2 errmsg1mod modatexit modcxaatexit \ - bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \ - bug-atexit2-lib bug-dl-leaf-lib \ - bug-dl-leaf-lib-cb moddummy1 moddummy2 +modules-names = \ + bug-atexit1-lib \ + bug-atexit2-lib \ + bug-dl-leaf-lib \ + bug-dl-leaf-lib-cb \ + bug-dlsym1-lib1 \ + bug-dlsym1-lib2 \ + defaultmod1 \ + defaultmod2 \ + errmsg1mod \ + failtestmod \ + glreflib1 \ + glreflib2 \ + glreflib3 \ + modatexit \ + modcxaatexit \ + moddummy1 \ + moddummy2 \ + # modules-names failtestmod.so-no-z-defs = yes glreflib2.so-no-z-defs = yes errmsg1mod.so-no-z-defs = yes ifeq (yes,$(build-shared)) -tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5 -tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5 -modules-names += modstatic modstatic2 modstatic3 modstatic5 +tests += \ + tststatic \ + tststatic2 \ + tststatic3 \ + tststatic4 \ + tststatic5 \ + # tests +tests-static += \ + tststatic \ + tststatic2 \ + tststatic3 \ + tststatic4 \ + tststatic5 \ + # tests-static +modules-names += \ + modstatic \ + modstatic2 \ + modstatic3 \ + modstatic5 \ + # modules-names tststatic-ENV = LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)elf tststatic2-ENV = $(tststatic-ENV) tststatic3-ENV = $(tststatic-ENV) From patchwork Sun Feb 25 18:39:45 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: 86341 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 836B63858C5E for ; Sun, 25 Feb 2024 18:41:57 +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 6AC1B3858420 for ; Sun, 25 Feb 2024 18:40:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AC1B3858420 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 6AC1B3858420 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=1708886422; cv=none; b=k+38F4dd5gT2eAJRgCspvwdGPxv6iNetZA+YnthnmJNEf5/TpBUXrbMVZGkHpG7WtwWQpIx/MjihqStrm2CwYF+DEr/zXHn6iLDPvvwkcfqu0K8QMVlFhvm95EqLTzd/mGV2vcP8sGPfA4bn45XcHPCxO0TsWSpfkMlXmVDy4P0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886422; c=relaxed/simple; bh=c57g5OmA6uj82Q0MC9B3/WOZ/m5XAt4JISGGbGHprjk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=MHwOszOxFETXYg8YY9YpenBpN19iz4MkvqSlzkLs6JiGD8aGLi4caFTduL/RQiu+ERTBNAuVdJKFtaUFt9LOBSZ2p1J6MfV0ExUkEhP81wlk6RDWgg6qaZMn6/0N38XeKHa+Rqntq2Knba0s2U+gdCjhG+X4yT16UTWg36YE+2o= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886421; 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=8ikA/RnWryiCz2uWXc/jX9oplJiInnxJK9t2hcB3Vc4=; b=Y5+TUfEdrB+gBOgPVt/KCLyMGlNfhMSwdzBrkALYfvMyugYDGvxl6BZWkS6dIY3B5krH7Q flBYi3J3s1YTOVqiQ9DPYBLVLcbKFpIgOaK9oP7hY86RYbnosMNoLxieQhQzceB9AyOdYJ m3JWiFbjRKIPzL69hL+rEbZdJTBn5Pc= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-201-CNBYB4_mOEal8bqhbc-H-g-1; Sun, 25 Feb 2024 13:40:19 -0500 X-MC-Unique: CNBYB4_mOEal8bqhbc-H-g-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-787d1903812so33444585a.2 for ; Sun, 25 Feb 2024 10:40:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886418; x=1709491218; 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=8ikA/RnWryiCz2uWXc/jX9oplJiInnxJK9t2hcB3Vc4=; b=U/F1Hclx1JitPwnmrTEx3dC2AAXDNfqCW1r56NQwA26rxYWZruNqhikscslj2LZnc3 KFljqBBgXRoZKQHtmLMsmsQEAphLkfdtOeFmHrsIOJOhsbdgvgo5rzxgpMMGaj6RNT28 beIeUWL/Se1ihrx0FRcSlvH42xeeoJzJWFRaxDPyjEFET2ZfKzo9L9G3ZmUhya5QwzNt ZC4qdM4IUIn7iLTNty2vDVgu75SZZ7GsiGMs4pp3ZtpAuX/cBl0/UwgHQTiS6Kbj8ElY D/IBJqsrkJ3yA2J7T9KQ4VQkfL35v2pt2jFSbBTswL5zEzMEitrt0vPG+sDruvy55gFv sVIw== X-Gm-Message-State: AOJu0YzSr3mJCjsosotvXmHOFtDaQ8gNYHnd8TZNvNEgnTxNr5gXLDUj U+ztRNKOi4mJgRvY87ntcKEjc6RbZZwsEw4+E/ylMesxUG0s8hjQoOioBeJ80qSMHRIbS8WWXMU vupQd0vtpmHGE03M3gX27lDdloSYszcN9xT8k+HrVb9MQwvb/N4Ol8eLOKwwgOymtSQfMGd+1QP nVW8jUxkyaoen5/5QWsTCOGk3LujI8x9MchMDdIsQ= X-Received: by 2002:a05:622a:1115:b0:42e:7305:d45e with SMTP id e21-20020a05622a111500b0042e7305d45emr7026366qty.48.1708886418635; Sun, 25 Feb 2024 10:40:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHtuN4Maq89PzfXrUpQSZS4ZLqkwaKM6Urh5liV453pPeKoERgHvj+YDkbAst+YSkuEojTAlQ== X-Received: by 2002:a05:622a:1115:b0:42e:7305:d45e with SMTP id e21-20020a05622a111500b0042e7305d45emr7026353qty.48.1708886418328; Sun, 25 Feb 2024 10:40:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:17 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 06/10] gmon: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:45 -0500 Message-ID: <20240225183956.2534939-6-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. --- gmon/Makefile | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/gmon/Makefile b/gmon/Makefile index 4e1a4a309c..db19c205d1 100644 --- a/gmon/Makefile +++ b/gmon/Makefile @@ -23,13 +23,28 @@ subdir := gmon include ../Makeconfig -headers := sys/gmon.h sys/gmon_out.h sys/profil.h -routines := gmon mcount profil sprofil prof-freq - -tests = tst-sprofil tst-gmon tst-mcount-overflow tst-mcleanup +headers := \ + sys/gmon.h \ + sys/gmon_out.h \ + sys/profil.h \ + # headers +routines := \ + gmon \ + mcount \ + prof-freq \ + profil \ + sprofil \ + # routines + +tests = \ + tst-gmon \ + tst-mcleanup \ + tst-mcount-overflow \ + tst-sprofil \ + # tests ifeq ($(build-profile),yes) -tests += tst-profile-static -tests-static += tst-profile-static +tests += tst-profile-static +tests-static += tst-profile-static LDFLAGS-tst-profile-static = -profile endif From patchwork Sun Feb 25 18:39:46 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: 86339 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 B6848385829D for ; Sun, 25 Feb 2024 18:41:34 +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 ACD3F3858D35 for ; Sun, 25 Feb 2024 18:40:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACD3F3858D35 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 ACD3F3858D35 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=1708886426; cv=none; b=osny697QX50TzAH+JuC8RZn6/5zoWR4B0wciHjPyCPZbj406KD3rcCRmDs5pYano9ZxBtymd9Gvx3l7BdipvKZ07Qdhww0l9VdxvaKfH4Zb76Z9Y83OIqPne8ssHyVu4P5qs9+eOEkuqv8coIxgxfLhkTmFLj4fLioC0lyK6yyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886426; c=relaxed/simple; bh=7BOvGUt/7DVECLZdXiOO6nqFAAq8XDsXAmaRfxqYBrI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=QVWS4AULn07JAyHL6jyDvAeWlxrzZJ+cQPCPZkKnojbg9nXALpBNH255Q/EFXJ5AwVQdYNwpNlA0qWlGR6zOJnSdbfkNb3eDXhm4i4Ax2KG2Hycqds6d1zXFoYpcTIa3DPmNFAjC44SoBkAu1+UoxgSwsNsJusQ+Ig33B4WUXZ4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886423; 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=BnmEZ+FcLLC+mX0fVzC59CoDFvM/ObxfQskGX0FQWLc=; b=jNAnqFMNnD2PUZXFKaDE8pfadiQLOyV3ovbgO1WpeQlnsPDVVZc4zZ6yYWDYLgLAVZglry 29OeV4R2/usYCkPf9van8j3mdpniNilZiJ7MIxjSl5kHqytc60UQelY3sEHLDDSbcig0Ly xkIvw64sYNr+mZoHYxRE+lPPmlZuEzg= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-35-p5fjoI55PkiSecK6fnGw4A-1; Sun, 25 Feb 2024 13:40:21 -0500 X-MC-Unique: p5fjoI55PkiSecK6fnGw4A-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-6085e433063so30425457b3.1 for ; Sun, 25 Feb 2024 10:40:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886420; x=1709491220; 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=BnmEZ+FcLLC+mX0fVzC59CoDFvM/ObxfQskGX0FQWLc=; b=OZs7oCXVVtvRDV7jZ4Jb2K7YQHa3dEZ5/DPukQS4majQVLQvO/N6DT5C2wNm1xHTvd DzALqjTuleCxBLm+il+jfb7CtHPId/TcZieVMF+BiZV3dnxQYRdZ57IUsCWLuJMr3eef su7hzXzE8HgZItuYGv3/gBngL1rIqXjxleeS1w2qCfMmbQavbwKpxzF23kYhfwbDxO/N da7OaRpukWHP5gLkOrCeXVW21D2WO9VPU2yJ3u4+l6H2aDBkBXJLVxjwHIQDslp+V3/g 9YZQUJaTN+Gp5f24y8x0Z2YVBEfztliSh7ZRu1HzKsLOAPMYuNuJdWw05GWd1MDVglXL 4SVw== X-Gm-Message-State: AOJu0Yz7bmHPh57iIgy67reJwgZWBQnqFyZpxXL9TzP3ggNOHWmi9kUC 47rCeQ+wGpi2pVBgevlBBg48SABn6jV5UXB16BProCHG6Xibsu72m1DDY124wjnSXGKBHgVXwEa m2enwfFbc9BBsEiV2NVMNZiYDhyXd2xE8ieeAPzB6y+WTveQpAoHm3/WPtjgHzqs1mW5EAGTvP2 ZKT+l3I7aNt9O37yrihiZH3liobb5OkH5DlWSAy8k= X-Received: by 2002:a81:ae06:0:b0:608:8733:eb33 with SMTP id m6-20020a81ae06000000b006088733eb33mr4476167ywh.33.1708886420557; Sun, 25 Feb 2024 10:40:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGf5QafYpGYu7W2qrJeVKkjOsI0ryuBKFqE/mCwx2h1GVfOP4+jiKJtxWDVu1gBPynimW2DKQ== X-Received: by 2002:a81:ae06:0:b0:608:8733:eb33 with SMTP id m6-20020a81ae06000000b006088733eb33mr4476158ywh.33.1708886420230; Sun, 25 Feb 2024 10:40:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:19 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 07/10] hesiod: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:46 -0500 Message-ID: <20240225183956.2534939-7-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=-12.4 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, 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. No code generation changes in non-test binary artifacts. No regressions on x86_64 and i686. --- hesiod/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hesiod/Makefile b/hesiod/Makefile index 9dee070ff7..397f92733f 100644 --- a/hesiod/Makefile +++ b/hesiod/Makefile @@ -28,8 +28,13 @@ extra-libs-others = $(extra-libs) subdir-dirs = nss_hesiod vpath %.c nss_hesiod -libnss_hesiod-routines := hesiod hesiod-grp hesiod-proto \ - hesiod-pwd hesiod-service +libnss_hesiod-routines := \ + hesiod \ + hesiod-grp \ + hesiod-proto \ + hesiod-pwd \ + hesiod-service \ + # libnss_hesiod-routines # Build only shared library libnss_hesiod-inhibit-o = $(filter-out .os,$(object-suffixes)) From patchwork Sun Feb 25 18:39:47 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: 86340 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 EAAD53858011 for ; Sun, 25 Feb 2024 18:41:51 +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 BE5713858C41 for ; Sun, 25 Feb 2024 18:40:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE5713858C41 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 BE5713858C41 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=1708886427; cv=none; b=K7g8OLvHaWBALddEOFrL0EioVKbAHmhhSZzMcfeyzwB01AhKlLDepqWgQxM+E2zmFWDxVCqi210F7qWD61wiesvUcet4mZYrxArwrVwAAC5Z5KN2nzLod2FMg6+7XZjkXA33YrGLJG4nJSU70QN9ZScn41t0omaKW3Ai0hDy3mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886427; c=relaxed/simple; bh=3dI6ti8SCfjOxaNCavTb4SJ8HYCPC6SAVhMfG95T8Sw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=atX1g8n0hvRrF1cHBCsl1Qj8w4bsoUG14tkV7nhlHavkhxPC4GlFZ14r8rvEJu7cxPJB9BeqaDE+zwNyLV6pmkqcJGXlt1nuvOgM+g04aIyBOW/OoYwY2H5hSKCDbQykrh81xgY0+cF3DdKhwGkoSWzPf/tKmU1CGMOLjeQiQ4U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886424; 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=vDF8tpPmznt2BcZD1skbY0j8TrXhwwtp6keJxhQIdlM=; b=SsK0fM5ajaWDrOLCXTo0AxspVrg+pv7ebyBAyz0FuiOxuT+eSxp1MmbDV8r75+PIv67y5J 5h8uK1TgMiV3Ogz/aCJPzGOkMz3r2zczExPbtxldsXQbny2TafDq3qObDJoPsoV8rvVeY6 WearDeMYBon4msMu+pH4Iiv9cnvutLQ= 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-145-BzC6Cn-KPEiiL6yFQrIbBA-1; Sun, 25 Feb 2024 13:40:23 -0500 X-MC-Unique: BzC6Cn-KPEiiL6yFQrIbBA-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-42e7dc9a7e6so9002681cf.0 for ; Sun, 25 Feb 2024 10:40:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886422; x=1709491222; 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=vDF8tpPmznt2BcZD1skbY0j8TrXhwwtp6keJxhQIdlM=; b=KKD97O43wK4JvEhbfHNiLno2nhz7clrfz2Zw1/TZzX9gc+YA5Y5n51cL7BpF+yeWRH 9cESH2/+ssNAmxvPlN+839JhdCpFzdEQsEHJfeNBYcPEexCNL9xP3t0NgYZBHQCkirh3 UbKL4mnJTKo1Ju2dQP2D9LMdytTX1jFN/VO57rsFJj4kmxmA6RFhi/q/ckTBfoeW2K22 XPkFY01IS1a7mT9jiYGSzUVepzE7KQNsDOE3NORK+Y4H7a6tmuKtqMsiUny7QaAc2/l3 AWA/Y6PqAmO5A2yoqaEVQJL0ZJi3JYAdZ4S0FDYkXOrXjcYtgLMyCOWgu2eX9utOxCQU 2kVw== X-Gm-Message-State: AOJu0YyxsiyI8Y60XEfD4utqL+/sKeocKxSYi1dunheXOw801sVI1/m9 0z9qLPr05hd8Pcpbl0pXo9LOwNLuAifPCUhU6uiNFKQJ2PHIrAJnWfbUI1Y/asQF4DXxPHfNXNp XdxtxYnJGABhlkeLnS1oRuh0UHSM6RiincRGuayqY4y737OXUdGX2uCH2qwYM/WXam+3lWi8M0e /9nM4RchvteNRUbWENszRonbR4dxt+kIKFCpyBrqg= X-Received: by 2002:a05:622a:19a0:b0:42e:5c0b:a9ca with SMTP id u32-20020a05622a19a000b0042e5c0ba9camr7387776qtc.49.1708886422272; Sun, 25 Feb 2024 10:40:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHkYo/iTFzFmJq3x3lhakREdCyR97XJS/W6rWN4yZRavVZ/O3hid5CP3qYs6flVAo/mfOHjQw== X-Received: by 2002:a05:622a:19a0:b0:42e:5c0b:a9ca with SMTP id u32-20020a05622a19a000b0042e5c0ba9camr7387754qtc.49.1708886421849; Sun, 25 Feb 2024 10:40:21 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:21 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 08/10] htl: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:47 -0500 Message-ID: <20240225183956.2534939-8-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. --- htl/Makefile | 324 +++++++++++++++++++++++++++++---------------------- 1 file changed, 183 insertions(+), 141 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index fd4d463ab0..4028e5a240 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -24,150 +24,192 @@ SYSDEPS := lockfile LCLHDRS := -libpthread-routines := pt-attr pt-attr-destroy \ - pt-attr-getguardsize \ - pt-attr-getscope \ - pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ - pt-attr-init pt-attr-setguardsize \ - pt-attr-setschedparam \ - pt-attr-setscope pt-attr-setstack \ - pt-attr-setstackaddr pt-attr-setstacksize \ - \ - pt-barrier-destroy pt-barrier-init pt-barrier-wait \ - pt-barrier pt-barrierattr-destroy pt-barrierattr-init \ - pt-barrierattr-getpshared pt-barrierattr-setpshared \ - \ - pt-destroy-specific pt-init-specific \ - pt-key-create pt-key-delete \ - pt-getspecific pt-setspecific \ - \ - pt-once \ - \ - pt-alloc \ - pt-create \ - pt-getattr \ - pt-dealloc \ - pt-detach \ - pt-exit \ - pt-initialize \ - pt-join \ - pt-sigmask \ - pt-spin-inlines \ - pt-cleanup \ - pt-setcancelstate \ - pt-setcanceltype \ - pt-testcancel \ - pt-cancel \ - \ - pt-mutexattr-destroy pt-mutexattr-init \ - pt-mutexattr-getprioceiling pt-mutexattr-getprotocol \ - pt-mutexattr-getpshared pt-mutexattr-gettype \ - pt-mutexattr-setprioceiling pt-mutexattr-setprotocol \ - pt-mutexattr-setpshared pt-mutexattr-settype \ - pt-mutexattr-getrobust pt-mutexattr-setrobust \ - \ - pt-mutex-init pt-mutex-destroy pt-mutex-checklocked \ - pt-mutex-lock pt-mutex-trylock pt-mutex-timedlock \ - pt-mutex-unlock \ - pt-mutex-transfer-np \ - pt-mutex-getprioceiling pt-mutex-setprioceiling \ - pt-mutex-consistent \ - \ - pt-rwlock-attr \ - pt-rwlockattr-init pt-rwlockattr-destroy \ - pt-rwlockattr-getpshared pt-rwlockattr-setpshared \ - \ - pt-rwlock-init pt-rwlock-destroy \ - pt-rwlock-rdlock pt-rwlock-tryrdlock \ - pt-rwlock-trywrlock pt-rwlock-wrlock \ - pt-rwlock-timedrdlock pt-rwlock-timedwrlock \ - pt-rwlock-unlock \ - \ - pt-cond \ - pt-condattr-init pt-condattr-destroy \ - pt-condattr-getclock pt-condattr-getpshared \ - pt-condattr-setclock pt-condattr-setpshared \ - \ - pt-cond-destroy pt-cond-init \ - pt-cond-brdcast \ - pt-cond-signal \ - pt-cond-wait \ - pt-cond-timedwait \ - pt-hurd-cond-wait \ - pt-hurd-cond-timedwait \ - \ - pt-stack-alloc \ - pt-thread-alloc \ - pt-thread-start \ - pt-thread-terminate \ - pt-startup \ - \ - pt-getconcurrency pt-setconcurrency \ - \ - pt-block \ - pt-timedblock \ - pt-block-intr \ - pt-timedblock-intr \ - pt-wakeup \ - pt-docancel \ - pt-sysdep \ - pt-setup \ - pt-machdep \ - pt-spin \ - \ - pt-sigstate-init \ - pt-sigstate-destroy \ - pt-sigstate \ - \ - pt-kill \ - pt-getcpuclockid \ - \ - pt-setschedprio \ - pt-yield \ - \ - sem_close sem-destroy sem-getvalue sem-init sem_open \ - sem-post sem-timedwait sem-trywait sem_unlink \ - sem-wait sem-waitfast \ - sem_routines \ - \ - cancellation \ - cthreads-compat \ - herrno \ - $(SYSDEPS) - -headers := \ - pthread.h \ - semaphore.h \ - \ - bits/pthread.h \ - bits/pthread-np.h \ - bits/pthreadtypes.h \ - bits/pthreadtypes-arch.h \ - bits/thread-shared-types.h \ - bits/types/struct___pthread_mutex.h \ - bits/types/struct___pthread_cond.h \ - bits/types/struct___pthread_condattr.h \ - bits/types/__pthread_spinlock_t.h \ - bits/spin-lock-inline.h \ - bits/cancelation.h \ - bits/types/struct___pthread_attr.h \ - bits/types/struct___pthread_barrierattr.h \ - bits/types/struct___pthread_barrier.h \ - bits/types/__pthread_key.h \ - bits/types/struct___pthread_once.h \ - bits/types/struct___pthread_mutexattr.h \ - bits/types/struct___pthread_rwlock.h \ - bits/types/struct___pthread_rwlockattr.h \ - bits/types/__pthread_t.h \ - bits/types/__thrd_t.h \ - bits/semaphore.h +libpthread-routines := \ + pt-attr \ + pt-attr-destroy \ + pt-attr-getguardsize \ + pt-attr-getscope \ + pt-attr-getstack \ + pt-attr-getstackaddr \ + pt-attr-getstacksize \ + pt-attr-init \ + pt-attr-setguardsize \ + pt-attr-setschedparam \ + pt-attr-setscope \ + pt-attr-setstack \ + pt-attr-setstackaddr \ + pt-attr-setstacksize \ + pt-barrier-destroy \ + pt-barrier-init \ + pt-barrier-wait \ + pt-barrier \ + pt-barrierattr-destroy \ + pt-barrierattr-init \ + pt-barrierattr-getpshared \ + pt-barrierattr-setpshared \ + pt-destroy-specific \ + pt-init-specific \ + pt-key-create \ + pt-key-delete \ + pt-getspecific \ + pt-setspecific \ + pt-once \ + pt-alloc \ + pt-create \ + pt-getattr \ + pt-dealloc \ + pt-detach \ + pt-exit \ + pt-initialize \ + pt-join \ + pt-sigmask \ + pt-spin-inlines \ + pt-cleanup \ + pt-setcancelstate \ + pt-setcanceltype \ + pt-testcancel \ + pt-cancel \ + pt-mutexattr-destroy \ + pt-mutexattr-init \ + pt-mutexattr-getprioceiling \ + pt-mutexattr-getprotocol \ + pt-mutexattr-getpshared \ + pt-mutexattr-gettype \ + pt-mutexattr-setprioceiling \ + pt-mutexattr-setprotocol \ + pt-mutexattr-setpshared \ + pt-mutexattr-settype \ + pt-mutexattr-getrobust \ + pt-mutexattr-setrobust \ + pt-mutex-init \ + pt-mutex-destroy \ + pt-mutex-checklocked \ + pt-mutex-lock \ + pt-mutex-trylock \ + pt-mutex-timedlock \ + pt-mutex-unlock \ + pt-mutex-transfer-np \ + pt-mutex-getprioceiling \ + pt-mutex-setprioceiling \ + pt-mutex-consistent \ + pt-rwlock-attr \ + pt-rwlockattr-init \ + pt-rwlockattr-destroy \ + pt-rwlockattr-getpshared \ + pt-rwlockattr-setpshared \ + pt-rwlock-init \ + pt-rwlock-destroy \ + pt-rwlock-rdlock \ + pt-rwlock-tryrdlock \ + pt-rwlock-trywrlock \ + pt-rwlock-wrlock \ + pt-rwlock-timedrdlock \ + pt-rwlock-timedwrlock \ + pt-rwlock-unlock \ + pt-cond \ + pt-condattr-init \ + pt-condattr-destroy \ + pt-condattr-getclock \ + pt-condattr-getpshared \ + pt-condattr-setclock \ + pt-condattr-setpshared \ + pt-cond-destroy \ + pt-cond-init \ + pt-cond-brdcast \ + pt-cond-signal \ + pt-cond-wait \ + pt-cond-timedwait \ + pt-hurd-cond-wait \ + pt-hurd-cond-timedwait \ + pt-stack-alloc \ + pt-thread-alloc \ + pt-thread-start \ + pt-thread-terminate \ + pt-startup \ + pt-getconcurrency \ + pt-setconcurrency \ + pt-block \ + pt-timedblock \ + pt-block-intr \ + pt-timedblock-intr \ + pt-wakeup \ + pt-docancel \ + pt-sysdep \ + pt-setup \ + pt-machdep \ + pt-spin \ + pt-sigstate-init \ + pt-sigstate-destroy \ + pt-sigstate \ + pt-kill \ + pt-getcpuclockid \ + pt-setschedprio \ + pt-yield \ + sem_close \ + sem-destroy \ + sem-getvalue \ + sem-init \ + sem_open \ + sem-post \ + sem-timedwait \ + sem-trywait \ + sem_unlink \ + sem-wait \ + sem-waitfast \ + sem_routines \ + cancellation \ + cthreads-compat \ + herrno \ + $(SYSDEPS) \ + # libpthread-routine + +headers := \ + bits/cancelation.h \ + bits/pthread-np.h \ + bits/pthread.h \ + bits/pthreadtypes-arch.h \ + bits/pthreadtypes.h \ + bits/semaphore.h \ + bits/spin-lock-inline.h \ + bits/thread-shared-types.h \ + bits/types/__pthread_key.h \ + bits/types/__pthread_spinlock_t.h \ + bits/types/__pthread_t.h \ + bits/types/__thrd_t.h \ + bits/types/struct___pthread_attr.h \ + bits/types/struct___pthread_barrier.h \ + bits/types/struct___pthread_barrierattr.h \ + bits/types/struct___pthread_cond.h \ + bits/types/struct___pthread_condattr.h \ + bits/types/struct___pthread_mutex.h \ + bits/types/struct___pthread_mutexattr.h \ + bits/types/struct___pthread_once.h \ + bits/types/struct___pthread_rwlock.h \ + bits/types/struct___pthread_rwlockattr.h \ + pthread.h \ + semaphore.h \ + # headers distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \ - pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched \ - pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate \ - pt-attr-setdetachstate +routines := \ + alloca_cutoff \ + forward \ + htlfreeres \ + libc_pthread_init \ + pt-attr-getdetachstate \ + pt-attr-getinheritsched \ + pt-attr-getschedparam \ + pt-attr-getschedpolicy \ + pt-attr-setdetachstate \ + pt-attr-setinheritsched \ + pt-attr-setschedpolicy \ + pt-getschedparam \ + pt-nthreads \ + pt-pthread_self \ + pt-self pt-equal \ + pt-setschedparam \ + # routines shared-only-routines = forward extra-libs := libpthread From patchwork Sun Feb 25 18:39:48 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: 86343 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 F26E93858421 for ; Sun, 25 Feb 2024 18:42:47 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id CE288385840D for ; Sun, 25 Feb 2024 18:40:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE288385840D 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 CE288385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886430; cv=none; b=iiWymNRO7L+za0LIjbZ04l34l/hh5kFfAVGk97WyKmGBZl/Ti6To73s67RgQUT7IoHcpwupIYwTyWdMKfcLPRebld6DJD6uglmT4rsh0B9pI2TrH2IDa8+Fx29DhtOd1iIcXZZ6o/tj761Vu5GinGmxeoA7xMck7y/hp0lLJ48g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886430; c=relaxed/simple; bh=+hPpysH5NK+wqySozLnXQgLg3m18C4KkMhbE551aXwc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=iZWY5c4vqaxVaxTdMn8ROZp2IbxtMu65vQSMxuI8VgxXOE0JZOhftUvZNuygLNkkrDuKXNbCZ8dD1WkR9QnFcFe2UwdrKCC+bHeZ22y2RDgj75vgmxieKCf9ypJp9HTVP1qB9jYuMCcMLkfYhNOUYlaXL83WQZ1GfiwFwlfw8ZE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886426; 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=nUgMkFeWS8FNf1o3TAX1WBpeSYTndvN7wG1pvrcSJhI=; b=UWrBMNtFPKTJthr/uPLeQ+HK90YfqK7ZbT9HA/vYbc45T7I0MkpiRKfPzXP9mKluFsHQWZ s9KrrU6OsTBArhUmYHUMYXK8x0T5P2m1zvz2TRvI75s6pe+dxyJXJzEX51rZjmehBsRyEv aXVIAiw9RpgE4qc1/1WjMpu1nzipZ7w= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-R6CjtYd0OgC1iI9bfpqoPw-1; Sun, 25 Feb 2024 13:40:25 -0500 X-MC-Unique: R6CjtYd0OgC1iI9bfpqoPw-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-42e84374255so2821891cf.3 for ; Sun, 25 Feb 2024 10:40:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886424; x=1709491224; 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=nUgMkFeWS8FNf1o3TAX1WBpeSYTndvN7wG1pvrcSJhI=; b=WTIPRhc5mWWfLPglsEkeaipkdMxAuub0O4zoV6eWCqq9ZXPkl/ByEaDPx9fFX9GV8Z qxB81KUtu6CGqTlg5l3aKBg2UorW9ZXrlfFZYuH5djyqDGj7+tOJgCFHYLek5QJeSbsg IU8L27cI7sYvVryvVxtyZQd+rUpAWA/DUb5kCtjC54cUI035lySH8/r1HDiy1PQBh3fF 1xzEo0JgWTo6WsBAdOpagKU0clFYpfY9kjkVi8oJHhp1fxu4bQcryS1FpNPYvtfkE85Q pT0m5M87Wo5GywX3JSa/5ppD0wmPqavyBNA+E7vXEa2n0WrnxxbQy3hGKyUxS4Zp2u3S CT5A== X-Gm-Message-State: AOJu0YxPbOIwIPDXVpxkBOkKP9OwbrV8f57LnJkFc1CnJRV+M3LSAPUu D95tOgzZxhYLKONQlvTJQtgEAN6F9RF0TSCVM3FPnCzA14HydEnekfGhhJ+Qbpv2XQSuAHiK2eh SVfrkFLtdLMqbpfC8Zkj0uuY2/UN4fIsfwqUxNABF1MYbkwZf+bttOye34PLn90sfDRv28gMHgX Ca3BewbU7wO0jkqvo1aVTSnqad8Ll1SVkmUMwViPQ= X-Received: by 2002:a05:622a:1485:b0:42e:7e24:87c5 with SMTP id t5-20020a05622a148500b0042e7e2487c5mr2562391qtx.62.1708886424407; Sun, 25 Feb 2024 10:40:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IH4N9xehg6+jnX3e4SEjKYlT5ZyfESP+H2lRvKNvy0d3FuNB/sjvLza1kIQQO1hiA9FCg2YLw== X-Received: by 2002:a05:622a:1485:b0:42e:7e24:87c5 with SMTP id t5-20020a05622a148500b0042e7e2487c5mr2562373qtx.62.1708886424035; Sun, 25 Feb 2024 10:40:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:22 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 09/10] htl/tests: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:48 -0500 Message-ID: <20240225183956.2534939-9-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_H4, RCVD_IN_MSPIKE_WL, 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. No code generation changes in non-test binary artifacts. No regressions on x86_64 and i686. Tested with build-many-glibcs.py for x86_64-gnu. --- htl/tests/Makefile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/htl/tests/Makefile b/htl/tests/Makefile index 7177ad181e..468adb58d5 100644 --- a/htl/tests/Makefile +++ b/htl/tests/Makefile @@ -7,9 +7,24 @@ CFLAGS=-Wall -g LDLIBS = -lpthread -CHECK_SRC := test-1.c test-2.c test-3.c test-6.c test-7.c test-8.c \ - test-9.c test-10.c test-11.c test-12.c test-13.c test-14.c \ - test-15.c test-16.c test-17.c test-__pthread_destroy_specific-skip.c +CHECK_SRC := \ + test-1.c \ + test-10.c \ + test-11.c \ + test-12.c \ + test-13.c \ + test-14.c \ + test-15.c \ + test-16.c \ + test-17.c \ + test-2.c \ + test-3.c \ + test-6.c \ + test-7.c \ + test-8.c \ + test-9.c \ + test-__pthread_destroy_specific-skip.c \ + # CHECK_SRC CHECK_OBJS := $(addsuffix .o,$(basename $(notdir $(CHECK_SRC)))) CHECK_PROGS := $(basename $(notdir $(CHECK_SRC))) \ @@ -37,4 +52,4 @@ check: $(CHECK_OBJS) $(CHECK_PROGS) clean: rm -f $(CHECK_OBJS) $(CHECK_PROGS) \ - $(addsuffix .out,$(basename $(notdir $(CHECK_PROGS)))) \ No newline at end of file + $(addsuffix .out,$(basename $(notdir $(CHECK_PROGS)))) 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