From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2191) id 241143857356; Tue, 16 May 2023 12:50:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 241143857356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241446; bh=9GKK7RhW/rBU2NFY2T/pyinsQUkaz7cx8kWVD785x98=; h=From:To:Subject:Date:From; b=m/Hf5q8Mf49Tr/xlQGK5WwlqLzS/7+cycUr6Ds5RUvv9g7ffnEKqA2lye/Of0LHrH jAz3xC+FRMdrH98CqvMi1ASFHyzImflg71ddQq6LldluaUKdSG4KXzjsXsiiicqP7e T7k3yTQwXH7NpJw/ltXMZV7tMHNEaPd/BhhnA8vo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Carlos O'Donell To: glibc-cvs@sourceware.org Subject: [glibc] elf: Reformat Makefile. X-Act-Checkin: glibc X-Git-Author: Carlos O'Donell X-Git-Refname: refs/heads/master X-Git-Oldrev: 71d9e0fe766a3c22a730995b9d024960970670af X-Git-Newrev: aa492359f1c9aae235ace2a6fe1e414f73718d00 Message-Id: <20230516125046.241143857356@sourceware.org> Date: Tue, 16 May 2023 12:50:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aa492359f1c9aae235ace2a6fe1e414f73718d00 commit aa492359f1c9aae235ace2a6fe1e414f73718d00 Author: Carlos O'Donell Date: Wed May 10 13:40:17 2023 -0400 elf: Reformat Makefile. 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. Diff: --- 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