From 6f1c701026287f6928d3bdd1aea7359308635abe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 3 Jun 2021 08:26:04 +0200 Subject: dlfcn: Cleanups after -ldl is no longer required This commit removes the ELF constructor and internal variables from dlfcn/dlfcn.c. The file now serves the same purpose as nptl/libpthread-compat.c, so it is renamed to dlfcn/libdl-compat.c. The use of libdl-shared-only-routines ensures that libdl.a is empty. This commit adjusts the test suite not to use $(libdl). The libdl.so symbolic link is no longer installed. Reviewed-by: Adhemerval Zanella --- stdlib/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'stdlib') diff --git a/stdlib/Makefile b/stdlib/Makefile index ec30011b4c..7c15549caf 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -106,7 +106,7 @@ LDLIBS-test-cxa_atexit-race2 = $(shared-thread-library) LDLIBS-test-on_exit-race = $(shared-thread-library) LDLIBS-tst-canon-bz26341 = $(shared-thread-library) -LDLIBS-test-dlclose-exit-race = $(shared-thread-library) $(libdl) +LDLIBS-test-dlclose-exit-race = $(shared-thread-library) LDFLAGS-test-dlclose-exit-race = $(LDFLAGS-rdynamic) LDLIBS-test-dlclose-exit-race-helper.so = $(libsupport) $(shared-thread-library) @@ -233,10 +233,10 @@ $(objpfx)tst-strtod-nan-sign: $(libm) tst-tls-atexit-lib.so-no-z-defs = yes test-dlclose-exit-race-helper.so-no-z-defs = yes -$(objpfx)tst-tls-atexit: $(shared-thread-library) $(libdl) +$(objpfx)tst-tls-atexit: $(shared-thread-library) $(objpfx)tst-tls-atexit.out: $(objpfx)tst-tls-atexit-lib.so -$(objpfx)tst-tls-atexit-nodelete: $(shared-thread-library) $(libdl) +$(objpfx)tst-tls-atexit-nodelete: $(shared-thread-library) $(objpfx)tst-tls-atexit-nodelete.out: $(objpfx)tst-tls-atexit-lib.so $(objpfx)tst-setcontext3.out: tst-setcontext3.sh $(objpfx)tst-setcontext3 @@ -244,5 +244,3 @@ $(objpfx)tst-setcontext3.out: tst-setcontext3.sh $(objpfx)tst-setcontext3 '$(run-program-env)' '$(test-program-prefix-after-env)' \ $(common-objpfx)stdlib/; \ $(evaluate-test) - -$(objpfx)tst-makecontext: $(libdl) -- cgit 1.4.1