From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id A4BA639A0458; Wed, 9 Jun 2021 17:14:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4BA639A0458 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] Remove stale references to libdl.a X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 51a3df5e358f3229b9f4e9ad1721fee591d4d29e X-Git-Newrev: 699361795f6af887f26585962b8a73a394aab653 Message-Id: <20210609171434.A4BA639A0458@sourceware.org> Date: Wed, 9 Jun 2021 17:14:34 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2021 17:14:34 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=699361795f6af887f26585962b8a73a394aab653 commit 699361795f6af887f26585962b8a73a394aab653 Author: Florian Weimer Date: Wed Jun 9 13:38:44 2021 +0200 Remove stale references to libdl.a Since commit 0c1c3a771eceec46e66ce1183cf988e2303bd373 ("dlfcn: Move dlopen into libc") libdl.a is empty, so linking against it is no longer necessary. Reviewed-by: Adhemerval Zanella Diff: --- elf/Makefile | 7 +------ sysdeps/powerpc/Makefile | 1 - sysdeps/powerpc/powerpc64/Makefile | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 6dbb03bbb2..5c47daee12 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1050,7 +1050,6 @@ unload7-ENV = MALLOC_PERTURB_=85 $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so ifeq ($(have-z-execstack),yes) @@ -1276,7 +1275,6 @@ $(objpfx)tst-leaks1-mem.out: $(objpfx)tst-leaks1.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@; \ $(evaluate-test) -$(objpfx)tst-leaks1-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-leaks1-static-mem.out: $(objpfx)tst-leaks1-static.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1-static.mtrace > $@; \ $(evaluate-test) @@ -1533,7 +1531,6 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(objpfx)tst-linkall-static: \ $(common-objpfx)math/libm.a \ $(common-objpfx)resolv/libresolv.a \ - $(common-objpfx)dlfcn/libdl.a \ $(common-objpfx)login/libutil.a \ $(common-objpfx)rt/librt.a \ $(common-objpfx)resolv/libanl.a \ @@ -1591,7 +1588,6 @@ $(objpfx)tst-absolute-zero: $(objpfx)tst-absolute-zero-lib.so # against libdl. $(objpfx)tst-libc_dlvsym-dso.so: $(libsupport) $(objpfx)tst-libc_dlvsym.out: $(objpfx)tst-libc_dlvsym-dso.so -$(objpfx)tst-libc_dlvsym-static: $(common-objpfx)dlfcn/libdl.a tst-libc_dlvsym-static-ENV = \ LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)dlfcn $(objpfx)tst-libc_dlvsym-static.out: $(objpfx)tst-libc_dlvsym-dso.so @@ -1696,7 +1692,7 @@ $(objpfx)tst-single_threaded: $(objpfx)tst-single_threaded-mod1.so $(objpfx)tst-single_threaded.out: \ $(objpfx)tst-single_threaded-mod2.so $(objpfx)tst-single_threaded-mod3.so $(objpfx)tst-single_threaded-static-dlopen: \ - $(objpfx)tst-single_threaded-mod1.o $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-single_threaded-mod1.o $(objpfx)tst-single_threaded-static-dlopen.out: \ $(objpfx)tst-single_threaded-mod2.so $(objpfx)tst-single_threaded-pthread: \ @@ -1834,6 +1830,5 @@ $(objpfx)tst-tls21: $(shared-thread-library) $(objpfx)tst-tls21.out: $(objpfx)tst-tls21mod.so $(objpfx)tst-tls21mod.so: $(tst-tls-many-dynamic-modules:%=$(objpfx)%.so) -$(objpfx)tst-getauxval-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-getauxval-static.out: $(objpfx)tst-auxvalmod.so tst-getauxval-static-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx) diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile index d1c71a0ca4..09860ffc01 100644 --- a/sysdeps/powerpc/Makefile +++ b/sysdeps/powerpc/Makefile @@ -25,7 +25,6 @@ test-internal-extras += mod-cache-ppc mod-cache-ppc.so-no-z-defs = yes tst-cache-ppc-static-dlopen-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf -$(objpfx)tst-cache-ppc-static-dlopen: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-cache-ppc-static-dlopen.out: $(objpfx)mod-cache-ppc.so $(objpfx)tst-cache-ppc: $(objpfx)mod-cache-ppc.so diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile index dd49dbbce2..679d5e49ba 100644 --- a/sysdeps/powerpc/powerpc64/Makefile +++ b/sysdeps/powerpc/powerpc64/Makefile @@ -59,7 +59,6 @@ tests += tst-setjmp-bug21895-static tests-static += tst-setjmp-bug21895-static modules-names += setjmp-bug21895 -$(objpfx)tst-setjmp-bug21895-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-setjmp-bug21895-static.out: $(objpfx)setjmp-bug21895.so tst-setjmp-bug21895-static-ENV = \