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