]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Fix elf/tst-tls9-static after libdl cleanups.
authorStefan Liebler <stli@linux.ibm.com>
Wed, 9 Jun 2021 11:19:51 +0000 (13:19 +0200)
committerStefan Liebler <stli@linux.ibm.com>
Wed, 9 Jun 2021 11:38:41 +0000 (13:38 +0200)
The testcase elf/tst-tls9-static sometimes fails with:
cannot open 'tst-tlsmod5.so': tst-tlsmod5.so: cannot open shared object file: No such file or directory
cannot open 'tst-tlsmod6.so': tst-tlsmod6.so: cannot open shared object file: No such file or directory

After recent commit
6f1c701026287f6928d3bdd1aea7359308635abe
"dlfcn: Cleanups after -ldl is no longer required"
the libdl variable is not set anymore and thus the
dependencies were missing.

elf/Makefile

index e9788d3d4fe1be070ababce1a1e56ebea8427a19..6dbb03bbb28326060c090a0602899e8217c49ec0 100644 (file)
@@ -1050,10 +1050,8 @@ unload7-ENV = MALLOC_PERTURB_=85
 
 $(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
 
-ifdef libdl
 $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
 $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
-endif
 
 ifeq ($(have-z-execstack),yes)
 $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so