From patchwork Tue May 16 12:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69467 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 D628E385416F for ; Tue, 16 May 2023 12:48:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D628E385416F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241338; bh=sc/gSw7BlNvEWmDTWqAFXubS14qakH2OcgddWBu/PRU=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=W8AqkCM6lXnQtLZTCnMxwqpv8KEst2GNvMgiFnBMtJtGMIXHsSCNzg2WbOgHOVCEV MrnXGq6TY0YmA9Skcp76a03WOppodC8ePTaiPn11cVqvAGSMhdDaZ2IjdUYQBJ6o0R m8rzcIUyVezulrKRd4ykgocO1dZK4mOZ63ptTLoI= 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 7BB1F3857722 for ; Tue, 16 May 2023 12:48:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7BB1F3857722 Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-DP9Bh34RPByAwLgXhTGO_Q-1; Tue, 16 May 2023 08:48:30 -0400 X-MC-Unique: DP9Bh34RPByAwLgXhTGO_Q-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-561b265e237so2247107b3.3 for ; Tue, 16 May 2023 05:48:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241310; x=1686833310; 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=sc/gSw7BlNvEWmDTWqAFXubS14qakH2OcgddWBu/PRU=; b=jzDSVTOC0icn7K/bT7ggapTmfujR0hO6DSt3Z/uKEoQTsws1mHbCOPcDpOfGIwQOFw wSAwyPtlx3XmM55ng6A77iM5w+8IY4bc4FeM7D6FQ/l0RioSrttE1BTckxwQO8LPvx5x aT8c/3qqGeq/qLPPjeTl1ozcT6EEP34hjnacNQ/QZu3akkmU6amO1dkXYiTabAOYrdKZ 01e6kcqEWNC+ntcqjgz8gC8X3r650F7cBO4ul8nB9j5fRnkEt2G+7npON7ilPb862CP1 EVo1a53rAPgntj+Az39qF3tMyywQfJQJJ71be5ZC6SBkgUBIo/kDM0puGaShubXT1azF TaFQ== X-Gm-Message-State: AC+VfDx64b8gmUprqhL2BGNQEbczvSrmml0m3TaKdsYJ0D9ZwafQlg83 T0rzrNq9dMeakAnzAukgTXLxWikkB0mw+tKFNWKG+NEUxhWLXo6T1Cs2PpS+m1ECjZdX4p25aTb vCuz3cbjQWHbbzkH6GYC+7rwU2GKgDytPlJ6dQRrCgjdBJ7H/f8tjhPaaDhRGZ94KkJTTsAmEfE tblw== X-Received: by 2002:a81:5b02:0:b0:559:eae4:9671 with SMTP id p2-20020a815b02000000b00559eae49671mr37532232ywb.14.1684241309970; Tue, 16 May 2023 05:48:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5uf0ru+GvDedZkTz5E9IYRcoNMiPs4dhRQxorUeN10NDPmTDPqVBpKhjzFi2M6HdhAHYVNSQ== X-Received: by 2002:a81:5b02:0:b0:559:eae4:9671 with SMTP id p2-20020a815b02000000b00559eae49671mr37532221ywb.14.1684241309650; Tue, 16 May 2023 05:48:29 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:28 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 1/8] elf: Reformat Makefile. Date: Tue, 16 May 2023 08:48:17 -0400 Message-Id: <20230516124824.146416-2-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Fix list terminator whitspace. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- elf/Makefile | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index b9056264d8..c6d499aa66 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -190,8 +190,8 @@ endif ifeq (yes,$(build-shared)) extra-objs = \ $(all-rtld-routines:%=%.os) \ - sofini.os \ interp.os \ + sofini.os \ # extra-objs generated += \ dl-allobjs.os \ @@ -395,17 +395,17 @@ tests += \ tst-deep1 \ tst-dl-is_dso \ tst-dlmodcount \ - tst-dlmopen1 \ - tst-dlmopen3 \ - tst-dlmopen4 \ tst-dlmopen-dlerror \ tst-dlmopen-gethostbyname \ tst-dlmopen-twice \ + tst-dlmopen1 \ + tst-dlmopen3 \ + tst-dlmopen4 \ + tst-dlopen-self \ + tst-dlopen-tlsmodid \ tst-dlopenfail \ tst-dlopenfail-2 \ tst-dlopenrpath \ - tst-dlopen-self \ - tst-dlopen-tlsmodid \ tst-dlsym-error \ tst-filterobj \ tst-filterobj-dlopen \ @@ -420,9 +420,9 @@ tests += \ tst-latepthread \ tst-main1 \ tst-next-ver \ - tst-nodelete2 \ tst-nodelete-dlclose \ tst-nodelete-opened \ + tst-nodelete2 \ tst-noload \ tst-null-argv \ tst-p_align1 \ @@ -436,6 +436,10 @@ tests += \ tst-sonamemove-dlopen \ tst-sonamemove-link \ tst-thrlock \ + tst-tls-dlinfo \ + tst-tls-ie \ + tst-tls-ie-dlmopen \ + tst-tls-manydynamic \ tst-tls10 \ tst-tls11 \ tst-tls12 \ @@ -452,10 +456,6 @@ tests += \ tst-tls5 \ tst-tlsalign \ tst-tlsalign-extern \ - tst-tls-dlinfo \ - tst-tls-ie \ - tst-tls-ie-dlmopen \ - tst-tls-manydynamic \ tst-unique1 \ tst-unique2 \ tst-unwind-ctor \ @@ -547,27 +547,27 @@ tests += \ tst-relr2 \ tst-relr3 \ tst-relr4 \ -# tests + # tests modules-names-dt-relr = \ tst-relr-mod2 \ tst-relr-mod3a \ tst-relr-mod3b \ tst-relr-mod4a \ tst-relr-mod4b \ -# modules-names-dt-relr + # modules-names-dt-relr modules-names += $(modules-names-dt-relr) # These shared libraries have special build rules. modules-names-nobuild += $(modules-names-dt-relr) ifeq ($(have-fpie),yes) tests += \ tst-relr-pie \ -# tests + # tests tests-pie += \ tst-relr-pie \ -# tests-pie + # tests-pie tests-special += \ $(objpfx)check-tst-relr-pie.out \ -# tests-special + # tests-special endif CFLAGS-tst-relr-pie.c += $(pie-ccflag) LDFLAGS-tst-relr += -Wl,-z,pack-relative-relocs @@ -781,8 +781,6 @@ modules-names += \ tst-auditmanymod9 \ tst-auditmod-tlsdesc \ tst-auditmod1 \ - tst-auditmod9a \ - tst-auditmod9b \ tst-auditmod11 \ tst-auditmod12 \ tst-auditmod18 \ @@ -799,6 +797,8 @@ modules-names += \ tst-auditmod24d \ tst-auditmod25 \ tst-auditmod28 \ + tst-auditmod9a \ + tst-auditmod9b \ tst-auxvalmod \ tst-big-note-lib \ tst-deep1mod1 \ @@ -813,11 +813,11 @@ modules-names += \ tst-dl_find_object-mod7 \ tst-dl_find_object-mod8 \ tst-dl_find_object-mod9 \ - tst-dlmopen1mod \ tst-dlmopen-dlerror-mod \ tst-dlmopen-gethostbyname-mod \ tst-dlmopen-twice-mod1 \ tst-dlmopen-twice-mod2 \ + tst-dlmopen1mod \ tst-dlopenfaillinkmod \ tst-dlopenfailmod1 \ tst-dlopenfailmod2 \ @@ -845,10 +845,10 @@ modules-names += \ tst-ldconfig-soname-lib-with-soname \ tst-ldconfig-soname-lib-without-soname \ tst-main1mod \ - tst-nodelete2mod \ tst-nodelete-dlclose-dso \ tst-nodelete-dlclose-plugin \ tst-nodelete-opened-lib \ + tst-nodelete2mod \ tst-null-argv-lib \ tst-p_alignmod-base \ tst-p_alignmod3 \ @@ -863,12 +863,6 @@ modules-names += \ tst-sonamemove-runmod1 \ tst-sonamemove-runmod2 \ tst-sprof-mod \ - tst-tls19mod1 \ - tst-tls19mod2 \ - tst-tls19mod3 \ - tst-tls20mod-bad \ - tst-tls21mod \ - tst-tlsalign-lib \ tst-tls-ie-mod0 \ tst-tls-ie-mod1 \ tst-tls-ie-mod2 \ @@ -876,6 +870,12 @@ modules-names += \ tst-tls-ie-mod4 \ tst-tls-ie-mod5 \ tst-tls-ie-mod6 \ + tst-tls19mod1 \ + tst-tls19mod2 \ + tst-tls19mod3 \ + tst-tls20mod-bad \ + tst-tls21mod \ + tst-tlsalign-lib \ tst-tlsmod1 \ tst-tlsmod10 \ tst-tlsmod11 \ @@ -925,7 +925,7 @@ modules-names += \ vismod1 \ vismod2 \ vismod3 \ -# modules-names + # modules-names modules-names-cxx = \ tst-dlopen-nodelete-reloc-mod1 \ @@ -1015,22 +1015,22 @@ modules-names-nobuild += \ tst-audit24bmod2 \ tst-big-note-lib \ tst-ro-dynamic-mod \ -# modules-names-nobuild + # modules-names-nobuild tests += $(tests-static) ifeq (yes,$(have-ifunc)) tests-ifuncstatic := \ - ifuncmain1static \ ifuncmain1picstatic \ - ifuncmain2static \ + ifuncmain1static \ ifuncmain2picstatic \ - ifuncmain4static \ + ifuncmain2static \ ifuncmain4picstatic \ - ifuncmain5static \ + ifuncmain4static \ ifuncmain5picstatic \ - ifuncmain7static \ + ifuncmain5static \ ifuncmain7picstatic \ + ifuncmain7static \ # tests-ifuncstatic ifeq (yes,$(have-gcc-ifunc)) tests-ifuncstatic += ifuncmain9static ifuncmain9picstatic @@ -1143,13 +1143,13 @@ tests-special += \ $(objpfx)tst-array5-static-cmp.out \ $(objpfx)tst-initorder-cmp.out \ $(objpfx)tst-initorder2-cmp.out \ - $(objpfx)tst-unused-dep-cmp.out \ - $(objpfx)tst-unused-dep.out \ $(objpfx)tst-trace1.out \ $(objpfx)tst-trace2.out \ $(objpfx)tst-trace3.out \ $(objpfx)tst-trace4.out \ $(objpfx)tst-trace5.out \ + $(objpfx)tst-unused-dep-cmp.out \ + $(objpfx)tst-unused-dep.out \ # tests-special endif From patchwork Tue May 16 12:48:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69470 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 8E52E385B526 for ; Tue, 16 May 2023 12:49:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E52E385B526 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241378; bh=+ZeqwfQyHf37QG54OnaNb81lKQekfXW0r/EvAGVVbec=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=SIIN6vuOo7SodlhrzSlTZ6CSZrQbhNlKVtQCykAK0F5EYl9fSy2Sy5z2xSZkKaio+ /I6KkB8PDVCAsS3d9FEdO+d+vet/jNtOHBl/dVbe8KKZyA8pmIFj0oxd4t/v0hmgTG 3a5pLgXk1U0F6ckLPH7BoHLYInxGx1j2x9On7U0k= 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 F32AD385773F for ; Tue, 16 May 2023 12:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F32AD385773F Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-GcgrJtSFPBiEA8sXONKceg-1; Tue, 16 May 2023 08:48:32 -0400 X-MC-Unique: GcgrJtSFPBiEA8sXONKceg-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-ba71ed074ceso5005106276.0 for ; Tue, 16 May 2023 05:48:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241311; x=1686833311; 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=+ZeqwfQyHf37QG54OnaNb81lKQekfXW0r/EvAGVVbec=; b=aIjr+oJXG6CdRzigMWL/ViSvFwfApOFat9TBuM07sHcJxjVJaZrTagm3jwnjRJOnLP tbwSNz9/lyTEv6h99YDCrkOoKX4i6J0lbAz+l2wgiWlfj+ydQzKtTmYhbyZ87MkxI5Qm nawkXq0E8TMuCIqM9tL5HqEaA33Duw91zGIM9qXYzMLIOTDlRCIr360ybRLUOIHd81Yk z/Xwlp6pzWgsmz85SuJLD1H+6wbkaVzSf5A5Mm28EQW/khIB+Ea28ln54teQEhhrLYP0 /Cm9tk3Opz53PXGWw3GPKvNjJuN/kwnF8lPdLOf8Hm9pKjlpwIOjQM23t/DD0FMnO4q0 QSxQ== X-Gm-Message-State: AC+VfDwT8GTD4MxrIAb4vsfHCCNsjYZ4QSroYoR+IGR1jbwBqAUsOMzS aIxN6ipUSO53Dm2BETKGxuudT0qlJ3gh6lpacjqSgicOVFEucmpjqH6qLW8rIu2rpb3fMDttyBt 5kMbpPEp7QuU8SLNYHG/nxFvFsDi/S9mH6K449XSL3na/9EHhH65SmkuxsPUMG8J01BGmLVrQ1R 6H5w== X-Received: by 2002:a25:c086:0:b0:b9e:67ab:4f36 with SMTP id c128-20020a25c086000000b00b9e67ab4f36mr33065397ybf.10.1684241311554; Tue, 16 May 2023 05:48:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ68HhZt5gcIWR3dbKOHtuXZt5obi62yHDamA6Kq5bWjVCCm7p4HQzbPKfTRKAxUrTJIfvNERA== X-Received: by 2002:a25:c086:0:b0:b9e:67ab:4f36 with SMTP id c128-20020a25c086000000b00b9e67ab4f36mr33065383ybf.10.1684241311224; Tue, 16 May 2023 05:48:31 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:30 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 2/8] debug: Reformat Makefile. Date: Tue, 16 May 2023 08:48:18 -0400 Message-Id: <20230516124824.146416-3-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Fix list terminator whitspace. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- debug/Makefile | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/debug/Makefile b/debug/Makefile index a8b4036cdc..096df27aeb 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -29,6 +29,7 @@ headers := execinfo.h # login/Makefile instead. If that subdir is omitted from the # build, its _FORTIFY_SOURCE support will be too. routines = \ + $(static-only-routines) \ ____longjmp_chk \ asprintf_chk \ backtrace \ @@ -113,7 +114,6 @@ routines = \ wmempcpy_chk \ wmemset_chk \ wprintf_chk \ - $(static-only-routines) \ # routines static-only-routines := stack_chk_fail_local @@ -267,23 +267,25 @@ CFLAGS-tst-ssp-1.c += -fstack-protector-all CFLAGS-tst-sprintf-fortify-unchecked.c = \ -fno-builtin-vsprintf -fno-builtin-__vsprintf_chk -tests = backtrace-tst \ - tst-longjmp_chk \ - test-strcpy_chk \ - test-stpcpy_chk \ - tst-longjmp_chk2 \ - tst-backtrace2 \ - tst-backtrace3 \ - tst-backtrace4 \ - tst-backtrace5 \ - tst-backtrace6 \ - tst-realpath-chk \ - tst-sprintf-fortify-unchecked \ - $(tests-all-chk) +tests = \ + $(tests-all-chk) \ + backtrace-tst \ + test-stpcpy_chk \ + test-strcpy_chk \ + tst-backtrace2 \ + tst-backtrace3 \ + tst-backtrace4 \ + tst-backtrace5 \ + tst-backtrace6 \ + tst-longjmp_chk \ + tst-longjmp_chk2 \ + tst-realpath-chk \ + tst-sprintf-fortify-unchecked \ + # tests tests-time64 += \ - $(tests-all-time64-chk) \ - # tests-time64 + $(tests-all-time64-chk) \ + # tests-time64 ifeq ($(have-ssp),yes) tests += tst-ssp-1 From patchwork Tue May 16 12:48:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69472 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 349CD3876887 for ; Tue, 16 May 2023 12:50:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 349CD3876887 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241421; bh=G2kId7pMPuaupkbZyk1Agu1gQtayOCmzT1em2mag0OQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=bHAL3Co1uITiBOqmnjoFde+EztqhQ8F6yL/hgf6E1c/fWN+gssYaWUkfFjvpMRx5X NJSC4r7KxlFSXC7rJ91bZkMPvBadcDOV2tzUpa1nD7gv/xTe38grPIFjTOIjbJCggm +CipaIZ3FJ+NikcID9HaY0dTUeWmzuSjecJfqo9U= 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 8B30D3857733 for ; Tue, 16 May 2023 12:48:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B30D3857733 Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-7pZ8Lg0dOSS2c4RTk0mxHw-1; Tue, 16 May 2023 08:48:34 -0400 X-MC-Unique: 7pZ8Lg0dOSS2c4RTk0mxHw-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-ba712bb7b28so4902956276.1 for ; Tue, 16 May 2023 05:48:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241313; x=1686833313; 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=G2kId7pMPuaupkbZyk1Agu1gQtayOCmzT1em2mag0OQ=; b=IvAKpr0dBl7LeOYO20+ujZBCBxAHovd+97JMJRxCy/eh/jIMhh9bzxap7odi9Bh037 PpFwEJStGgIqNPTcvBb49Th/m75JjHbbugoOmGdExOWg42hBZS58WzYGGYQKUaLgY7Oi g3HP0dig4XxggrOz63l5ZmxKiQ7n30YndM85KkqZuMcYGt4RYnRS6u2hyioEpTSI39fN a6Xr/lXJFokKjatN9hpAlpGErW1j5dIfUZYICGDImUGL0Xg8RDBxsZggc9NDzsvsYh38 ImTCorHnLvHiOFNllDLrvnZ28FJk84DP/nutwJsXSMq1V7GN8H7VesmoMSkIuKOIUByf ngqg== X-Gm-Message-State: AC+VfDzBGzQJviOcDi8H4XcFn6XRBavsDHEepeMx48mmRhrPjfJ+YXx0 dS6CV7jpTHB1tdY+ry9Ow5BecH59QT0DI44tiU9EQ2YRr1g+JJmsNFY8Rh6paXAC/5tWLuBQwhV lwozCk2K6kHQ1iKt+ApTMVnQZkEo1mwVi7Xs8V10OgQWn8u8Hh41caauiQ45pughXKuonkMVJY1 Fn+w== X-Received: by 2002:a81:1304:0:b0:561:a41f:be78 with SMTP id 4-20020a811304000000b00561a41fbe78mr730107ywt.3.1684241313076; Tue, 16 May 2023 05:48:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mic5NRQfH4PTmmA2VXzVLwebop4fMEJSIQLM8i7rKv3rYwVtM9+mxvGLN4Zm5PPRJL5XI1Q== X-Received: by 2002:a81:1304:0:b0:561:a41f:be78 with SMTP id 4-20020a811304000000b00561a41fbe78mr730093ywt.3.1684241312731; Tue, 16 May 2023 05:48:32 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:31 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 3/8] misc: Reformat Makefile. Date: Tue, 16 May 2023 08:48:19 -0400 Message-Id: <20230516124824.146416-4-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. Code generation is changed as routines are linked in sorted order as expected. No regressions on x86_64 and i686. --- misc/Makefile | 299 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 232 insertions(+), 67 deletions(-) diff --git a/misc/Makefile b/misc/Makefile index 9f42321206..1a21347f5e 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -23,79 +23,240 @@ subdir := misc include ../Makeconfig -headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \ - sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ - sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \ - ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \ - ttyent.h paths.h sys/reboot.h \ - sys/mman.h sys/param.h bits/param.h \ - fstab.h mntent.h search.h err.h error.h \ - sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \ - sys/select.h sys/sysinfo.h \ - regexp.h bits/select.h bits/mman.h sys/xattr.h \ - syslog.h sys/syslog.h \ - bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \ - bits/select2.h bits/hwcap.h sys/auxv.h \ - sys/sysmacros.h bits/sysmacros.h bits/types/struct_iovec.h \ - bits/err-ldbl.h bits/error-ldbl.h \ - sys/single_threaded.h - -routines := brk sbrk sstk ioctl \ - readv writev preadv preadv64 pwritev pwritev64 \ - preadv2 preadv64v2 pwritev2 pwritev64v2 \ - setreuid setregid \ - seteuid setegid \ - getpagesize \ - getdtsz \ - gethostname sethostname getdomain setdomain \ - select pselect \ - acct chroot fsync sync fdatasync syncfs reboot \ - gethostid sethostid \ - revoke vhangup \ - swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \ - mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \ - ualarm usleep \ - gtty stty \ - ptrace \ - fstab mntent mntent_r \ - utimes lutimes futimes futimesat \ - truncate ftruncate truncate64 ftruncate64 \ - chflags fchflags \ - insremque getttyent getusershell getpass ttyslot \ - syslog syscall daemon \ - mmap mmap64 munmap mprotect msync madvise mincore remap_file_pages\ - mlock munlock mlockall munlockall \ - efgcvt efgcvt_r qefgcvt qefgcvt_r \ - hsearch hsearch_r tsearch lsearch \ - err error ustat \ - getsysstats dirname regexp \ - getloadavg getclktck \ - fgetxattr flistxattr fremovexattr fsetxattr getxattr \ - listxattr lgetxattr llistxattr lremovexattr lsetxattr \ - removexattr setxattr getauxval ifunc-impl-list makedev \ - allocate_once fd_to_filename single_threaded unwind-link \ - atomic_wide_counter - -generated += tst-error1.mtrace tst-error1-mem.out \ - tst-allocate_once.mtrace tst-allocate_once-mem.out +headers := \ + sys/uio.h \ + bits/uio-ext.h \ + bits/uio_lim.h \ + sys/ioctl.h \ + bits/ioctls.h \ + bits/ioctl-types.h \ + sys/ptrace.h \ + sys/file.h \ + sys/dir.h \ + sys/cdefs.h \ + ar.h \ + a.out.h \ + libgen.h \ + stab.h \ + bits/stab.def \ + sgtty.h \ + ttyent.h \ + paths.h \ + sys/reboot.h \ + sys/mman.h \ + sys/param.h \ + bits/param.h \ + fstab.h \ + mntent.h \ + search.h \ + err.h \ + error.h \ + sys/queue.h \ + sysexits.h \ + syscall.h \ + sys/syscall.h \ + sys/swap.h \ + sys/select.h \ + sys/sysinfo.h \ + regexp.h \ + bits/select.h \ + bits/mman.h \ + sys/xattr.h \ + syslog.h \ + sys/syslog.h \ + bits/syslog.h \ + bits/syslog-ldbl.h \ + bits/syslog-path.h \ + bits/error.h \ + bits/select2.h \ + bits/hwcap.h \ + sys/auxv.h \ + sys/sysmacros.h \ + bits/sysmacros.h \ + bits/types/struct_iovec.h \ + bits/err-ldbl.h \ + bits/error-ldbl.h \ + sys/single_threaded.h \ + # headers + +routines := \ + acct \ + allocate_once \ + atomic_wide_counter \ + brk \ + chflags \ + chroot \ + daemon \ + dirname \ + efgcvt \ + efgcvt_r \ + err \ + error \ + fchflags \ + fd_to_filename \ + fdatasync \ + fgetxattr \ + flistxattr \ + fremovexattr \ + fsetxattr \ + fstab \ + fsync \ + ftruncate \ + ftruncate64 \ + futimes \ + futimesat \ + getauxval \ + getclktck \ + getdomain \ + getdtsz \ + gethostid \ + gethostname \ + getloadavg \ + getpagesize \ + getpass \ + getsysstats \ + getttyent \ + getusershell \ + getxattr \ + gtty \ + hsearch \ + hsearch_r \ + ifunc-impl-list \ + insremque \ + ioctl \ + lgetxattr \ + listxattr \ + llistxattr \ + lremovexattr \ + lsearch \ + lsetxattr \ + lutimes \ + madvise \ + makedev \ + mincore \ + mkdtemp \ + mkostemp \ + mkostemp64 \ + mkostemps \ + mkostemps64 \ + mkstemp \ + mkstemp64 \ + mkstemps \ + mkstemps64 \ + mktemp \ + mlock \ + mlockall \ + mmap \ + mmap64 \ + mntent \ + mntent_r \ + mprotect \ + msync \ + munlock \ + munlockall \ + munmap \ + preadv \ + preadv64 \ + preadv2 \ + preadv64v2 \ + pselect \ + ptrace \ + pwritev \ + pwritev64 \ + pwritev2 \ + pwritev64v2 \ + qefgcvt \ + qefgcvt_r \ + readv \ + reboot \ + regexp \ + remap_file_pages \ + removexattr \ + revoke \ + sbrk \ + select \ + setdomain \ + setegid \ + seteuid \ + sethostid \ + sethostname \ + setregid \ + setreuid \ + setxattr \ + single_threaded \ + sstk \ + stty \ + swapoff \ + swapon \ + sync \ + syncfs \ + syscall \ + syslog \ + truncate \ + truncate64 \ + tsearch \ + ttyslot \ + ualarm \ + unwind-link \ + usleep \ + ustat \ + utimes \ + vhangup \ + writev \ + # routines + +generated += \ + tst-allocate_once-mem.out \ + tst-allocate_once.mtrace \ + tst-error1-mem.out \ + tst-error1.mtrace \ + # generated aux := init-misc install-lib := libg.a -gpl2lgpl := error.c error.h -tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \ - tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ - tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ - tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ - tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \ - tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt \ - tst-mntent-autofs tst-syscalls tst-mntent-escape tst-select \ - tst-ioctl tst-ldbl-errorfptr +gpl2lgpl := \ + error.c \ + error.h \ + # gpl2lgpl + +tests := \ + bug-hsearch1 \ + bug18240 \ + tst-dbl-efgcvt \ + tst-dirname \ + tst-empty \ + tst-error1 \ + tst-fdset \ + tst-hsearch \ + tst-insremque \ + tst-ioctl \ + tst-ldbl-efgcvt \ + tst-ldbl-error \ + tst-ldbl-errorfptr \ + tst-ldbl-warn \ + tst-makedev \ + tst-mntent \ + tst-mntent-autofs \ + tst-mntent-blank-corrupt \ + tst-mntent-blank-passno \ + tst-mntent-escape \ + tst-mntent2 \ + tst-preadvwritev \ + tst-preadvwritev64 \ + tst-preadvwritev2 \ + tst-preadvwritev64v2 \ + tst-pselect \ + tst-select \ + tst-syscalls \ + tst-tsearch \ + tst-warn-wide \ + # tests tests-time64 := \ - tst-select-time64 \ - tst-pselect-time64 \ tst-ioctl-time64 \ + tst-pselect-time64 \ + tst-select-time64 \ # tests-time64 # Tests which need libdl. @@ -103,7 +264,11 @@ ifeq (yes,$(build-shared)) tests += tst-gethostid endif -tests-internal := tst-atomic tst-atomic-long tst-allocate_once +tests-internal := \ + tst-allocate_once \ + tst-atomic \ + tst-atomic-long \ + # tests-internal tests-static := tst-empty # Test for the internal, non-exported __fd_to_filename function. From patchwork Tue May 16 12:48:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69474 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 BE0E2386D618 for ; Tue, 16 May 2023 12:51:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE0E2386D618 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241464; bh=l5NXu5HQBhjgjHWxi/QxGNvxiJvZerY4a01YDcqcg0U=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=GGgheNWIgnNlMhH5HiLsNN9q/ams8MQgRgHbSouruc5eHbDYOqKJWG4zbPPxeyxOC yn6iZWieHIDYRCJKsVcZMu+VED4S62byz2dq2JDtzsl/u8sy5yrCUQFLpMeMgUKcMr IFWNKcvOK4g45k2noPgjAWTkUOsNefUSknGGpY6g= 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 AF7343856DD7 for ; Tue, 16 May 2023 12:48:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF7343856DD7 Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-PMWWbh2dMpKaVL-onw1-_g-1; Tue, 16 May 2023 08:48:35 -0400 X-MC-Unique: PMWWbh2dMpKaVL-onw1-_g-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-56183784dd3so11010787b3.3 for ; Tue, 16 May 2023 05:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241314; x=1686833314; 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=l5NXu5HQBhjgjHWxi/QxGNvxiJvZerY4a01YDcqcg0U=; b=K7s4SUPdwBpLf/j8VwSDs8d1c+yu9Kcm4X3Yb4xCeBdoyyzOSO2O35UuKkF5ZaStWj fYAASQJ6J0J+9ceC5jCEWW4mVkZVqjQPWqakBSL4abrFQqVdkTzonD7qg/lAylcyCvmd 8J0Yi3y1tl4DIHd4CMRi1IOEKkcLDcay5lvntH1d8rpFb8Xg8vww4YQ9M++aupJJjZDP Lfzms4Gp40m2/kYFVomjpQ7LtVwuastWk8xseKxla/DXVZ19BQs3aaL4Lmn7HwfgXYpa Hn+xH6JG6yLYlAQbjOgsVfZAkRhGssFHXNQ6SmBMdciUnnsgc9uPOS2/3mF/kCscaSH6 BPEQ== X-Gm-Message-State: AC+VfDyDCgtFK4szInD2RA7RGGo5zp1oT5+aTTFKTwuZsNC7LsRMqXBv 5bfgFWXlSAZ2bOYEWOCbKfwSsIP/0WaEuDA9RQeIXzVXHSdO/EPTUT1ifFaeWXFuX2zZAZ+aIDl JUcjPhwuIcrjp1HkahfTfEiypaMguxR56+Q3jnDHLL7OjQcKfttZG06DnDb4nOBZVjPGfoUw25q j83g== X-Received: by 2002:a0d:d4c3:0:b0:55a:9d84:2e4e with SMTP id w186-20020a0dd4c3000000b0055a9d842e4emr33037014ywd.18.1684241314503; Tue, 16 May 2023 05:48:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Dt+FgB9/PQb72v57mMNSarFt1Cb9d/DBPSniMvXfFD/rEZSsIKyKVx8/yt5iPvfpfPrjz4A== X-Received: by 2002:a0d:d4c3:0:b0:55a:9d84:2e4e with SMTP id w186-20020a0dd4c3000000b0055a9d842e4emr33037003ywd.18.1684241314222; Tue, 16 May 2023 05:48:34 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:33 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 4/8] socket: Reformat Makefile. Date: Tue, 16 May 2023 08:48:20 -0400 Message-Id: <20230516124824.146416-5-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. Code generation is changed as routines are linked in sorted order as expected. No regressions on x86_64 and i686. --- socket/Makefile | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/socket/Makefile b/socket/Makefile index 94951ae3e7..d9b0b4af64 100644 --- a/socket/Makefile +++ b/socket/Makefile @@ -22,20 +22,49 @@ subdir := socket include ../Makeconfig -headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \ - bits/socket2.h bits/types/struct_osockaddr.h \ - sys/socketvar.h net/if.h +headers := \ + bits/sockaddr.h \ + bits/socket.h \ + bits/socket2.h \ + bits/types/struct_osockaddr.h \ + net/if.h \ + sys/socket.h \ + sys/socketvar.h \ + sys/un.h \ + # headers -routines := accept bind connect getpeername getsockname getsockopt \ - listen recv recvfrom recvmsg send sendmsg sendto \ - setsockopt shutdown socket socketpair isfdtype opensock \ - sockatmark accept4 recvmmsg sendmmsg sockaddr_un_set +routines := \ + accept \ + accept4 \ + bind \ + connect \ + getpeername \ + getsockname \ + getsockopt \ + isfdtype \ + listen \ + opensock \ + recv \ + recvfrom \ + recvmmsg \ + recvmsg \ + send \ + sendmmsg \ + sendmsg \ + sendto \ + setsockopt \ + shutdown \ + sockaddr_un_set \ + sockatmark \ + socket \ + socketpair \ + # routines tests := \ tst-accept4 \ - tst-sockopt \ - tst-cmsghdr \ tst-cmsg_cloexec \ + tst-cmsghdr \ + tst-sockopt \ # tests tests-internal := \ From patchwork Tue May 16 12:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69468 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 54195385382F for ; Tue, 16 May 2023 12:49:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 54195385382F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241348; bh=Xn0By5sGqPOhO811Xsz586ecOpQRM0YmnndTyYTCeCw=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=VzXRRhShvdLjuYvH/6oTYdbKGhLXzNARfwKyaXJd4kCO1CCHshQZnjgu6zcxVDqMB WTyB5fbM35P6uhckc7pi0ag0o+mdL1ITZ1h3eagIMBf+nMPivXzer14D/XzAq8EdI7 5zMtzwnYoWpqgSFXRutguk2IFNpZyM8gFJTtVFt4= 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 E04E13856DEC for ; Tue, 16 May 2023 12:48:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E04E13856DEC Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-328-gU0kAZc2PzOqrcGCZGZ4_Q-1; Tue, 16 May 2023 08:48:37 -0400 X-MC-Unique: gU0kAZc2PzOqrcGCZGZ4_Q-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-55a04468981so291338137b3.0 for ; Tue, 16 May 2023 05:48:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241316; x=1686833316; 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=Xn0By5sGqPOhO811Xsz586ecOpQRM0YmnndTyYTCeCw=; b=Tg9if/tBWQ0pChm6qzgqhOrWgBXv3XZ8SktZX6LP0qIXG3H0IdqXJCHeglryY/h8Hv TXbVjj3yjtJTfDgy52IDr8Jk5YO14BcTFdEzqwk8daeN5rMPGQ5n58GaCVjH5+ax673V s9KbF4ZsDSWGdi/z8PfRT6x69fpuXp9dlJcVvPO6lbePujJ0PQdZThKS1Duk2GyeDOcf rlbrZGJ5hTsvinnvBQwElQ/YcAXbhxEYThi9xxfXIysegjthYedTaZmZKBl7G87I3yGB Mq+LyxveguusCl7mYTEtTlEsobHDYibJKj7/wfxB+0MvN8fxJUc86QMAxMDfUXCtxpXw GG3Q== X-Gm-Message-State: AC+VfDxzBOBX8EoEnaOpLHRdQ8fxUdUCleOhs1zRLn1UzT+juvg6lGPv LVv8OX+UctCVDEylVdRd51UpRRuhx/wHALII7sBUc8gIsQWhEsBlO9/wkzGXuQKhVTYgNg9BWCu c6V22KLhHFXf3KkWa0ylhRoo0yz6W2mjLCVxS0AiR8E4TDxaPssGpQ/aQWkJA2AddjFb61dIIPB e6CA== X-Received: by 2002:a81:6c94:0:b0:54f:b615:ab5d with SMTP id h142-20020a816c94000000b0054fb615ab5dmr34676804ywc.14.1684241315994; Tue, 16 May 2023 05:48:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6GVxETxDp9HrRvuL28Fe7KDWEio9DeRCbLWeYAn9t6q87VSJWk9QfINXEo19A2ezRAZSTO7g== X-Received: by 2002:a81:6c94:0:b0:54f:b615:ab5d with SMTP id h142-20020a816c94000000b0054fb615ab5dmr34676795ywc.14.1684241315705; Tue, 16 May 2023 05:48:35 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:34 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 5/8] stdio-common: Reformat Makefile. Date: Tue, 16 May 2023 08:48:21 -0400 Message-Id: <20230516124824.146416-6-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. Code generation is changed as routines are linked in sorted order as expected. No regressions on x86_64 and i686. --- stdio-common/Makefile | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 7cf8d814ea..1b4997afc8 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -22,7 +22,12 @@ subdir := stdio-common include ../Makeconfig -headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h +headers := \ + bits/printf-ldbl.h \ + bits/stdio_lim.h \ + printf.h \ + stdio_ext.h \ + # headers routines := \ _itoa \ @@ -41,18 +46,18 @@ routines := \ getw \ grouping_iterator \ iovfscanf \ - isoc99_fscanf \ - isoc99_scanf \ - isoc99_sscanf \ - isoc99_vfscanf \ - isoc99_vscanf \ - isoc99_vsscanf \ isoc23_fscanf \ isoc23_scanf \ isoc23_sscanf \ isoc23_vfscanf \ isoc23_vscanf \ isoc23_vsscanf \ + isoc99_fscanf \ + isoc99_scanf \ + isoc99_sscanf \ + isoc99_vfscanf \ + isoc99_vscanf \ + isoc99_vsscanf \ itoa-digits \ itoa-udigits \ itowa-digits \ @@ -238,9 +243,9 @@ tests := \ tst-unlockedio \ tst-vfprintf-mbs-prec \ tst-vfprintf-user-type \ + tst-vfprintf-width-i18n \ tst-vfprintf-width-prec \ tst-vfprintf-width-prec-alloc \ - tst-vfprintf-width-i18n \ tst-wc-printf \ tstdiomisc \ tstgetln \ @@ -250,6 +255,7 @@ tests := \ tests-container += \ tst-popen3 + # tests-container generated += \ errlist-data-aux-shared.S \ @@ -262,7 +268,11 @@ tests-internal = \ tst-grouping_iterator \ # tests-internal -test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble +test-srcs = \ + tst-printf \ + tst-printfsz-islongdouble \ + tst-unbputc \ + # test-srcs ifeq ($(run-built-tests),yes) tests-special += \ @@ -340,7 +350,7 @@ LOCALES := \ ja_JP.EUC-JP \ ps_AF.UTF-8 \ tg_TJ.UTF-8 \ - # LOCALES + # LOCALES include ../gen-locales.mk $(objpfx)bug14.out: $(gen-locales) From patchwork Tue May 16 12:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69469 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 2FC2C385357B for ; Tue, 16 May 2023 12:49:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2FC2C385357B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241350; bh=FzlJDf2PyIFlenPyk5TSfSqZukqrRz8y9o5Inz/Ik0o=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=abzBrOI+UfTCOh9ZtZwkgpA8bVsAK2peBAFxIybUGXspAlIwgnZ5yZQSPTfH5Mpys MsU/542E6hIm2qbwoNzT/zDoYBiDWNPEC62oc6OD3lZhHA/QvrDhjx4Oh6l45Gd0Zh kqZ1wiIlYFKADq/zo0y3aB0jTFvudFE2Qhn48NWs= 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 38B4D385695F for ; Tue, 16 May 2023 12:48:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 38B4D385695F Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-On4HUWDfN4O-9K49f9r94A-1; Tue, 16 May 2023 08:48:38 -0400 X-MC-Unique: On4HUWDfN4O-9K49f9r94A-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-561a80d872dso4931217b3.3 for ; Tue, 16 May 2023 05:48:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241317; x=1686833317; 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=FzlJDf2PyIFlenPyk5TSfSqZukqrRz8y9o5Inz/Ik0o=; b=Tyr6l/xJb4uNoRtmbD5KOpz4ILtJB+0QdDHjaieoZzgr6oK1DrFPzY5f2dWCYsay6f 76qfWWzSfjhS6sy5mOe8AgNYwBPmFQXTQKC6cWy55Tjb15u9C/9uX1dXFN8QEdXzDtVE F9xWwJE1Zeoyl7CMZJIHhopNPc0R+ctWA7yYg8Z8HemFdgs/nEKwLZzRIg9YSUBDKUVf P4lL9zvj1g4yw+8HCrocbw0IOrrjchhj4Ua56jTOcNXDFlkw1gaCMIZ9To4mXna4M+Yo xIzcqoHLbm1PKhzpLNi8nekBR1HiTxARSK87oSwMeBKGNssu6n1VzhwOZ5iEXr4zBKjM T4Ww== X-Gm-Message-State: AC+VfDwuN3wfSGe/y55rhwKhj0g+wTx9CHzF9dwtFiwnlBvQ0p0+W+II 9DVmhj8Jc4zoCWA94UOswqhrGNCWU5eK6wgBsterPUMRFR5i1socP6gxQRNJph1lPwHTDCd9WzF UVp2dVfs6CzBnQtdXlq5VUnDh9D8vRTisCJ3npgSOjpB5d2NmVHyUdoGI8fGF/pLRkeHG0nnglG B9Bg== X-Received: by 2002:a81:a157:0:b0:559:e240:3c27 with SMTP id y84-20020a81a157000000b00559e2403c27mr34081111ywg.23.1684241317450; Tue, 16 May 2023 05:48:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7qLGMmDSMcEZxv9TOiu2pyYpE95W8XWSQ1IyXLKRusBWG8LKFEVuY1c2uFO8JSw44X1vLlcw== X-Received: by 2002:a81:a157:0:b0:559:e240:3c27 with SMTP id y84-20020a81a157000000b00559e2403c27mr34081099ywg.23.1684241317146; Tue, 16 May 2023 05:48:37 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:36 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 6/8] stdlib: Reformat Makefile. Date: Tue, 16 May 2023 08:48:22 -0400 Message-Id: <20230516124824.146416-7-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- stdlib/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/Makefile b/stdlib/Makefile index 5e38f0e6a2..59ffed79b9 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -31,8 +31,8 @@ headers := \ bits/stdint-uintn.h \ bits/stdlib-bsearch.h \ bits/stdlib-float.h \ - bits/stdlib.h \ bits/stdlib-ldbl.h \ + bits/stdlib.h \ bits/time64.h \ bits/timesize.h \ bits/types/error_t.h \ @@ -59,7 +59,7 @@ routines := \ atof \ atoi \ atol\ - atoll \ + atoll \ bsearch \ canonicalize \ cxa_at_quick_exit \ @@ -155,8 +155,8 @@ aux = \ # Instead the static object files will be included in a special archive # linked against when the shared library will be used. static-only-routines = \ - atexit \ at_quick_exit \ + atexit \ # static-only-routines test-srcs := \ From patchwork Tue May 16 12:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69473 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 87CD7385702C for ; Tue, 16 May 2023 12:50:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87CD7385702C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241433; bh=24H8YQoZkUTweLHRfALj9Kb57xWu7YHYnBu30LHE8kU=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=oC3pVxnvQcOOdxb2W3GbgYMNZT1G6UzO1R2saMcYNw6h0n38KwUW5t36D5FTsyKSI JWs+UOv/gJNRpR0UbjBzQI1Wmfu4H1+dF1pejKid9pcJjIyQEXcE8B8L8HzYG4PAAt Qy6SRQ1b5dysjqm8RNvidPEDCkJ8/dZjtxjxXl8U= 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 DA9223856943 for ; Tue, 16 May 2023 12:48:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DA9223856943 Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-354-_hlNZwdvOQaeneaNRBZ6lQ-1; Tue, 16 May 2023 08:48:40 -0400 X-MC-Unique: _hlNZwdvOQaeneaNRBZ6lQ-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-559e55b8766so225183187b3.1 for ; Tue, 16 May 2023 05:48:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241319; x=1686833319; 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=24H8YQoZkUTweLHRfALj9Kb57xWu7YHYnBu30LHE8kU=; b=Y5gxUrVQ1zMQL9KG/Tk5xq73gNr0ICmyvWLy8npaLw0Ix1YkFvygnOG4zk7Iq2gf/z ekWxrWbaHChbyU5HZhtudnmysEB/4lP2gxnZ5Pgal0E9Qu1hxbMl9RI0ND7QJKKY7iwq 1YNeSC2BAyC/O+TAtisFzGy72YLrQv26QGq6o4c6dBFSUyut0pYqKpj/i9RxwYN/+Rkk GHw4wcQ5er2TWd85DmjahJtKRP1nuvEd1dOSXWx82aMAzYbcY+TMxI8eqT7yRi3Oy9RP 5YMPxIiWpt9OzO/xtEKpmXmxYbjPe5Yh/W+n6CJhPGTqWgbAACC6IXnMs8nhMIk3u24x CL8g== X-Gm-Message-State: AC+VfDwzewGe63h+RZ9S7ZzK8T8TRcwJKjcEHCBKp+maekNYl+94Zd85 6VCUPw8x1jcTtInRQqDE51KyIRYlFn6Fx0IJE0/Q5Nnv57qzVqDlZscP/E10PrhV1UbCh6scwY3 +aZnAnWMilYeLTGDT+Xmzgw6rpxapGuOR9b5Axs/KepAIo1O4DUcEgZSPDrDRW5L2vdoq68lNPF mhqA== X-Received: by 2002:a81:88c2:0:b0:55a:7c7:7be1 with SMTP id y185-20020a8188c2000000b0055a07c77be1mr32194965ywf.22.1684241319084; Tue, 16 May 2023 05:48:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6bCuTZh3BFGwkjOznsfeLlpyiyrdzztZiJm6tpbFEdcqeDLTpPl4NGMlX4K/pZjg5Ib+wz/A== X-Received: by 2002:a81:88c2:0:b0:55a:7c7:7be1 with SMTP id y185-20020a8188c2000000b0055a07c77be1mr32194950ywf.22.1684241318754; Tue, 16 May 2023 05:48:38 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:37 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 7/8] linux: Reformat Makefile. Date: Tue, 16 May 2023 08:48:23 -0400 Message-Id: <20230516124824.146416-8-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- sysdeps/unix/sysv/linux/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index e73684d443..594a5dc53e 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -6,8 +6,8 @@ sysdeps-linux-python-cc = \ # Additional dependencies for Python scripts. sysdeps-linux-python-deps = \ - $(..)sysdeps/unix/sysv/linux/glibcsyscalls.py \ $(..)scripts/glibcextract.py \ + $(..)sysdeps/unix/sysv/linux/glibcsyscalls.py \ # sysdeps-linux-python-deps # Invocation of the Python interpreter with the Python search path. @@ -109,7 +109,7 @@ sysdep_routines += \ xmknodat \ xstat \ xstat64 \ - # sysdeps-routines + # sysdep_routines CFLAGS-gethostid.c = -fexceptions CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables @@ -185,7 +185,7 @@ sysdep_headers += \ sys/timerfd.h \ sys/user.h \ sys/vt.h \ - # sysdep-headers + # sysdep_headers tests += \ test-errno-linux \ @@ -261,10 +261,10 @@ tests-time64 += \ tst-ntp_gettime-time64 \ tst-ntp_gettimex-time64 \ tst-ppoll-time64 \ - tst-sigtimedwait-time64 \ - tst-timerfd-time64 \ tst-prctl-time64 \ tst-scm_rights-time64 \ + tst-sigtimedwait-time64 \ + tst-timerfd-time64 \ # tests-time64 tests-clone-internal = \ @@ -272,6 +272,7 @@ tests-clone-internal = \ tst-clone2-internal \ tst-clone3-internal \ tst-getpid1-internal + # tests-clone-internal tests-internal += \ $(tests-clone-internal) \ # tests-internal @@ -451,8 +452,8 @@ tests += \ tst-socket-timestamp-compat \ # tests tests-time64 += \ + tst-socket-timestamp-compat-time64 \ tst-socket-timestamp-time64 \ - tst-socket-timestamp-compat-time64 # tests-time64 tests-special += \ From patchwork Tue May 16 12:48:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69471 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 AB25C38555B8 for ; Tue, 16 May 2023 12:49:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB25C38555B8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241390; bh=jQGc0ErTvK2C0nBIN258ckpdFgI1skwVOUQ+qVQOKPk=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KDBd5SoTA6tYpWLIvJ3AR2TvtfeeisFQW/Cf+8EqYZO49rO/GmJszlKrshu0j4SMJ WxpIb1RQ6Z7iu3gu7XkN6vjyH0PllookvbVQ9MAnn2pFT3apZ6OYjH9uFS7Cdm8W2Z 9NTuIOKwxvx8o8w39aRs+ZbmO/FMEkXFG6xkn3y8= 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 CE9FF3856DC6 for ; Tue, 16 May 2023 12:48:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE9FF3856DC6 Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-442-MBhjvvAkO72n5Crp-STdrA-1; Tue, 16 May 2023 08:48:41 -0400 X-MC-Unique: MBhjvvAkO72n5Crp-STdrA-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-ba82ed6e450so806703276.2 for ; Tue, 16 May 2023 05:48:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241320; x=1686833320; 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=jQGc0ErTvK2C0nBIN258ckpdFgI1skwVOUQ+qVQOKPk=; b=afXTe8rQI597BiyL9bXaVHQS6D/hV8AAgCcnVLPo4bOlwTnnpmHYzMkb+LAdzRPJUH eXRMgXjH6phXfFUcLqPkosPZan5E5ZTO4XQcq60HFblhL5xadvew4DxTIwXBP+ndH7Ru MdzkYpUagstdQbkHBis0rRMcDNmBXQ2vnpMUW08jVYq33fzSmzqQk1RBxAIQuxQZRiij szWvw4LIv380PVKaCCNj2leeMyMQjqfcgoJEQVItO32TB/7rHDbhmCSbs9S5rNG/kDjO J/xPNkl5cXCgABrGSRDDlJyAQ5HXsJvssRcxJazNuFW4wO7jlIuR7JKsyr9jf0uAKqza f63w== X-Gm-Message-State: AC+VfDyOyCfKeF8wALP49ZbSF6Z8rmsc899KZXFT+SNSHC1XuAKq7mHs LcJxI4kpQCfHyGvZAlFJRYiyeD1mOLvI5niSaXeOHBYUb/acIP3Qcl2AZlZmYC7Otc/mNncXKLF 7m2yi4ia90W34jqFp8gM83pMNbbKoRquQz8g6mLlZ3dZuV+hupIEjxBwKRArSoclkZMo/odhqRx BWuA== X-Received: by 2002:a05:6902:1023:b0:ba7:d830:df61 with SMTP id x3-20020a056902102300b00ba7d830df61mr6515061ybt.37.1684241320406; Tue, 16 May 2023 05:48:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ61I8mnIJKr45uOz3Z4uq0adqRrcrkmjtHrYC88J2j3YUDZKxA9BzqA/eyXGDsgufIGyjZoxA== X-Received: by 2002:a05:6902:1023:b0:ba7:d830:df61 with SMTP id x3-20020a056902102300b00ba7d830df61mr6515046ybt.37.1684241320134; Tue, 16 May 2023 05:48:40 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:39 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 8/8] wcsmbs: Reformat Makefile. Date: Tue, 16 May 2023 08:48:24 -0400 Message-Id: <20230516124824.146416-9-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- wcsmbs/Makefile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 0dc264e971..347b44841e 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -22,9 +22,17 @@ subdir := wcsmbs include ../Makeconfig -headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar2-decl.h \ - bits/wchar-ldbl.h uchar.h bits/types/__mbstate_t.h \ - bits/types/mbstate_t.h bits/types/wint_t.h +headers := \ + bits/types/__mbstate_t.h \ + bits/types/mbstate_t.h \ + bits/types/wint_t.h \ + bits/wchar-ldbl.h \ + bits/wchar.h \ + bits/wchar2-decl.h \ + bits/wchar2.h \ + uchar.h \ + wchar.h \ + # headers routines := \ btowc \ @@ -123,11 +131,11 @@ tests := \ test-wcscmp \ test-wcscpy \ test-wcscspn \ + test-wcsdup \ test-wcslen \ test-wcsncat \ test-wcsncmp \ test-wcsncpy \ - test-wcsdup \ test-wcsnlen \ test-wcspbrk \ test-wcsrchr \ @@ -169,8 +177,17 @@ tests := \ include ../Rules ifeq ($(run-built-tests),yes) -LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 hr_HR.ISO-8859-2 \ - ja_JP.EUC-JP zh_TW.EUC-TW tr_TR.UTF-8 tr_TR.ISO-8859-9 zh_HK.BIG5-HKSCS +LOCALES := \ + de_DE.ISO-8859-1 \ + de_DE.UTF-8 \ + en_US.ANSI_X3.4-1968 \ + hr_HR.ISO-8859-2 \ + ja_JP.EUC-JP \ + tr_TR.ISO-8859-9 \ + tr_TR.UTF-8 \ + zh_HK.BIG5-HKSCS \ + zh_TW.EUC-TW \ + # LOCALES include ../gen-locales.mk $(objpfx)tst-btowc.out: $(gen-locales)