diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-03 09:11:45 +0200 |
| commit | 6f1c701026287f6928d3bdd1aea7359308635abe (patch) | |
| tree | 8dcf3b5a755f131435a912f7629478deaff74264 /resolv/Makefile | |
| parent | 0c1c3a771eceec46e66ce1183cf988e2303bd373 (diff) | |
| download | glibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.gz glibc-6f1c701026287f6928d3bdd1aea7359308635abe.tar.xz glibc-6f1c701026287f6928d3bdd1aea7359308635abe.zip | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'resolv/Makefile')
| -rw-r--r-- | resolv/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index fb19c93026..3fbc320ee1 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -149,7 +149,7 @@ $(objpfx)libnss_dns.so: $(objpfx)libresolv.so # The asynchronous name lookup code needs the thread library. $(objpfx)libanl.so: $(shared-thread-library) -$(objpfx)tst-res_hconf_reorder: $(libdl) $(shared-thread-library) +$(objpfx)tst-res_hconf_reorder: $(shared-thread-library) tst-res_hconf_reorder-ENV = RESOLV_REORDER=on $(objpfx)tst-leaks: $(objpfx)libresolv.so @@ -173,12 +173,11 @@ $(objpfx)mtrace-tst-resolv-res_ninit.out: $(objpfx)tst-resolv-res_ninit.out $(objpfx)tst-bug18665-tcp: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-bug18665: $(objpfx)libresolv.so $(shared-thread-library) -$(objpfx)tst-resolv-ai_idn: \ - $(libdl) $(objpfx)libresolv.so $(shared-thread-library) +$(objpfx)tst-resolv-ai_idn: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-ai_idn-latin1: \ - $(libdl) $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-ai_idn-nolibidn2: \ - $(libdl) $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-ai_idn.out: $(gen-locales) $(objpfx)tst-resolv-ai_idn-latin1.out: $(gen-locales) $(objpfx)tst-resolv-ai_idn-nolibidn2.out: \ @@ -187,22 +186,20 @@ $(objpfx)tst-resolv-basic: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-binary: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-edns: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-network: $(objpfx)libresolv.so $(shared-thread-library) -$(objpfx)tst-resolv-res_init: $(libdl) $(objpfx)libresolv.so +$(objpfx)tst-resolv-res_init: $(objpfx)libresolv.so $(objpfx)tst-resolv-res_init-multi: $(objpfx)libresolv.so \ $(shared-thread-library) -$(objpfx)tst-resolv-res_init-thread: $(libdl) $(objpfx)libresolv.so \ +$(objpfx)tst-resolv-res_init-thread: $(objpfx)libresolv.so \ $(shared-thread-library) $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library) -$(objpfx)tst-resolv-threads: \ - $(libdl) $(objpfx)libresolv.so $(shared-thread-library) +$(objpfx)tst-resolv-threads: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-txnid-collision: $(objpfx)libresolv.a \ $(static-thread-library) -$(objpfx)tst-resolv-canonname: \ - $(libdl) $(objpfx)libresolv.so $(shared-thread-library) +$(objpfx)tst-resolv-canonname: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-trustad: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-ns_name: $(objpfx)libresolv.so |