mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-18 12:16:13 +08:00
79520f4bd6
glibc's Makeconfig defines some variables such as $(libm) and $(libdl) for linking with libraries built by glibc, and nptl/Makeconfig (included by the toplevel Makeconfig) defines others such as $(shared-thread-library). In some places glibc's Makefiles use those variables when linking against the relevant libraries, but in other places they hardcode the location of the libraries in the build tree. This patch cleans up various places to use the variables that already exist (in the case of libm, replacing several duplicate definitions of a $(link-libm) variable in subdirectory Makefiles). (It's not necessarily exactly equivalent to what the existing code does - in particular, $(shared-thread-library) includes libpthread_nonshared, but is replacing places that just referred to libpthread.so. But I think that change is desirable on the general principle of linking things as close as possible to the way in which they would be linked with an installed library, unless there is a clear reason not to do so.) To support running tests with an installed copy of glibc without needing the full build tree from when that copy was built, I think it will be useful to use such variables more generally and systematically - every time the rules for building a test refer to some file from the build tree that's also installed by glibc, use a makefile variable so that the installed-testing case can point those variables to installed copies of the files. This patch just deals with straightforward cases where such variables already exist. It's quite possible some uses of $(shared-thread-library) should actually be a new $(thread-library) variable that's set appropriately in the --disable-shared case, if those uses would in fact work without shared libraries. I didn't change the status quo that those cases hardcode use of a shared library whether or not it's actually needed (but other uses such as $(libm) and $(libdl) would now get the static library if the shared library isn't built, when some previously hardcoded use of the shared library - if they actually need shared libraries, the test itself needs an enable-shared conditional anyway). Tested x86_64. * benchtests/Makefile ($(addprefix $(objpfx)bench-,$(bench-math))): Depend on $(libm), not $(common-objpfx)math/libm.so. ($(addprefix $(objpfx)bench-,$(bench-pthread))): Depend on $(shared-thread-library), not $(common-objpfx)nptl/libpthread.so. * elf/Makefile ($(objpfx)noload): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. ($(objpfx)tst-audit8): Depend on $(libm), not $(common-objpfx)math/libm.so. * malloc/Makefile ($(objpfx)libmemusage.so): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. * math/Makefile ($(addprefix $(objpfx),$(filter-out $(tests-static),$(tests)))): Depend on $(libm), not $(objpfx)libm.so. Do not condition on [$(build-shared) = yes]. ($(objpfx)test-fenv-tls): Depend on $(shared-thread-library), not $(common-objpfx)nptl/libpthread.so. * misc/Makefile ($(objpfx)tst-tsearch): Depend on $(libm), not $(common-objpfx)math/libm.so$(libm.so-version) or $(common-objpfx)math/libm.a depending on [$(build-shared) = yes]. * nptl/Makefile ($(objpfx)tst-unload): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. * setjmp/Makefile (link-libm): Remove variable. ($(objpfx)tst-setjmp-fp): Depend on $(libm), not $(link-libm). * stdio-common/Makefile (link-libm): Remove variable. ($(objpfx)tst-printf-round): Depend on $(libm), not $(link-libm). * stdlib/Makefile (link-libm): Remove variable. ($(objpfx)bug-getcontext): Depend on $(libm), not $(link-libm). ($(objpfx)tst-strtod-round): Likewise. ($(objpfx)tst-tininess): Likewise. ($(objpfx)tst-strtod-underflow): Likewise. ($(objpfx)tst-strtod6): Likewise. ($(objpfx)tst-tls-atexit): Depend on $(shared-thread-library) and $(libdl), not $(common-objpfx)nptl/libpthread.so and $(common-objpfx)dlfcn/libdl.so. |
||
|---|---|---|
| .. | ||
| cache.c | ||
| chroot_canon.c | ||
| circleload1.c | ||
| circlemod1.c | ||
| circlemod1a.c | ||
| circlemod2.c | ||
| circlemod2a.c | ||
| circlemod3.c | ||
| circlemod3a.c | ||
| constload1.c | ||
| constload2.c | ||
| constload3.c | ||
| dblload.c | ||
| dblloadmod1.c | ||
| dblloadmod2.c | ||
| dblloadmod3.c | ||
| dblunload.c | ||
| dep1.c | ||
| dep2.c | ||
| dep3.c | ||
| dep4.c | ||
| dl-addr.c | ||
| dl-brk.c | ||
| dl-cache.c | ||
| dl-caller.c | ||
| dl-close.c | ||
| dl-conflict.c | ||
| dl-debug.c | ||
| dl-deps.c | ||
| dl-dst.h | ||
| dl-environ.c | ||
| dl-error.c | ||
| dl-execstack.c | ||
| dl-fini.c | ||
| dl-fptr.c | ||
| dl-hwcaps.c | ||
| dl-init.c | ||
| dl-iteratephdr.c | ||
| dl-libc.c | ||
| dl-load.c | ||
| dl-load.h | ||
| dl-lookup.c | ||
| dl-map-segments.h | ||
| dl-minimal.c | ||
| dl-misc.c | ||
| dl-object.c | ||
| dl-open.c | ||
| dl-origin.c | ||
| dl-profile.c | ||
| dl-profstub.c | ||
| dl-reloc.c | ||
| dl-runtime.c | ||
| dl-sbrk.c | ||
| dl-scope.c | ||
| dl-support.c | ||
| dl-sym.c | ||
| dl-symaddr.c | ||
| dl-sysdep.c | ||
| dl-tls.c | ||
| dl-trampoline.c | ||
| dl-tsd.c | ||
| dl-unmap-segments.h | ||
| dl-version.c | ||
| dl-writev.h | ||
| do-rel.h | ||
| dynamic-link.h | ||
| elf.h | ||
| enbl-secure.c | ||
| failobj.c | ||
| filter.c | ||
| filtmod1.c | ||
| filtmod2.c | ||
| firstobj.c | ||
| gen-trusted-dirs.awk | ||
| genrtldtbl.awk | ||
| get-dynamic-info.h | ||
| global.c | ||
| globalmod1.c | ||
| ifuncdep1.c | ||
| ifuncdep1pic.c | ||
| ifuncdep2.c | ||
| ifuncdep2pic.c | ||
| ifuncdep5.c | ||
| ifuncdep5pic.c | ||
| ifuncmain1.c | ||
| ifuncmain1pic.c | ||
| ifuncmain1picstatic.c | ||
| ifuncmain1pie.c | ||
| ifuncmain1static.c | ||
| ifuncmain1staticpic.c | ||
| ifuncmain1staticpie.c | ||
| ifuncmain1vis.c | ||
| ifuncmain1vispic.c | ||
| ifuncmain1vispie.c | ||
| ifuncmain2.c | ||
| ifuncmain2pic.c | ||
| ifuncmain2picstatic.c | ||
| ifuncmain2static.c | ||
| ifuncmain3.c | ||
| ifuncmain4.c | ||
| ifuncmain4picstatic.c | ||
| ifuncmain4static.c | ||
| ifuncmain5.c | ||
| ifuncmain5pic.c | ||
| ifuncmain5picstatic.c | ||
| ifuncmain5pie.c | ||
| ifuncmain5static.c | ||
| ifuncmain5staticpic.c | ||
| ifuncmain6pie.c | ||
| ifuncmain7.c | ||
| ifuncmain7pic.c | ||
| ifuncmain7picstatic.c | ||
| ifuncmain7pie.c | ||
| ifuncmain7static.c | ||
| ifuncmod1.c | ||
| ifuncmod3.c | ||
| ifuncmod5.c | ||
| ifuncmod6.c | ||
| initfirst.c | ||
| interp.c | ||
| lateglobal.c | ||
| ldconfig.c | ||
| ldd.bash.in | ||
| link.h | ||
| loadfail.c | ||
| loadtest.c | ||
| ltglobmod1.c | ||
| ltglobmod2.c | ||
| Makefile | ||
| multiload.c | ||
| neededobj1.c | ||
| neededobj2.c | ||
| neededobj3.c | ||
| neededobj4.c | ||
| neededobj5.c | ||
| neededobj6.c | ||
| neededtest2.c | ||
| neededtest3.c | ||
| neededtest4.c | ||
| neededtest.c | ||
| next.c | ||
| nextmod1.c | ||
| nextmod2.c | ||
| nodel2mod1.c | ||
| nodel2mod2.c | ||
| nodel2mod3.c | ||
| nodelete2.c | ||
| nodelete.c | ||
| nodelmod1.c | ||
| nodelmod2.c | ||
| nodelmod3.c | ||
| nodelmod4.c | ||
| nodlopen2.c | ||
| nodlopen.c | ||
| nodlopenmod2.c | ||
| nodlopenmod.c | ||
| noload.c | ||
| order2.c | ||
| order2mod1.c | ||
| order2mod2.c | ||
| order2mod3.c | ||
| order2mod4.c | ||
| order.c | ||
| origtest.c | ||
| pathoptobj.c | ||
| pldd-xx.c | ||
| pldd.c | ||
| preloadtest.c | ||
| readelflib.c | ||
| readlib.c | ||
| reldep2.c | ||
| reldep3.c | ||
| reldep4.c | ||
| reldep4mod1.c | ||
| reldep4mod2.c | ||
| reldep4mod3.c | ||
| reldep4mod4.c | ||
| reldep5.c | ||
| reldep6.c | ||
| reldep6mod0.c | ||
| reldep6mod1.c | ||
| reldep6mod2.c | ||
| reldep6mod3.c | ||
| reldep6mod4.c | ||
| reldep7.c | ||
| reldep7mod1.c | ||
| reldep7mod2.c | ||
| reldep8.c | ||
| reldep8mod1.c | ||
| reldep8mod2.c | ||
| reldep8mod3.c | ||
| reldep9.c | ||
| reldep9mod1.c | ||
| reldep9mod2.c | ||
| reldep9mod3.c | ||
| reldep.c | ||
| reldepmod1.c | ||
| reldepmod2.c | ||
| reldepmod3.c | ||
| reldepmod4.c | ||
| reldepmod5.c | ||
| reldepmod6.c | ||
| resolvfail.c | ||
| restest1.c | ||
| restest2.c | ||
| rtld-debugger-interface.txt | ||
| rtld-Rules | ||
| rtld.c | ||
| setup-vdso.h | ||
| sln.c | ||
| sofini.c | ||
| soinit.c | ||
| sotruss-lib.c | ||
| sotruss.sh | ||
| sprof.c | ||
| static-stubs.c | ||
| testobj1_1.c | ||
| testobj1.c | ||
| testobj2.c | ||
| testobj3.c | ||
| testobj4.c | ||
| testobj5.c | ||
| testobj6.c | ||
| testobj.h | ||
| tls-macros.h | ||
| tlsdeschtab.h | ||
| tst-addr1.c | ||
| tst-align2.c | ||
| tst-align.c | ||
| tst-alignmod2.c | ||
| tst-alignmod.c | ||
| tst-array1-static.c | ||
| tst-array1.c | ||
| tst-array1.exp | ||
| tst-array2.c | ||
| tst-array2.exp | ||
| tst-array2dep.c | ||
| tst-array3.c | ||
| tst-array4.c | ||
| tst-array4.exp | ||
| tst-array5-static.c | ||
| tst-array5-static.exp | ||
| tst-array5.c | ||
| tst-array5.exp | ||
| tst-array5dep.c | ||
| tst-audit1.c | ||
| tst-audit2.c | ||
| tst-audit8.c | ||
| tst-audit9.c | ||
| tst-auditmod1.c | ||
| tst-auditmod9a.c | ||
| tst-auditmod9b.c | ||
| tst-auxv.c | ||
| tst-deep1.c | ||
| tst-deep1mod1.c | ||
| tst-deep1mod2.c | ||
| tst-deep1mod3.c | ||
| tst-dlmodcount.c | ||
| tst-dlmopen1.c | ||
| tst-dlmopen1mod.c | ||
| tst-dlmopen2.c | ||
| tst-dlmopen3.c | ||
| tst-dlopen-aout.c | ||
| tst-dlopenrpath.c | ||
| tst-dlopenrpathmod.c | ||
| tst-execstack-mod.c | ||
| tst-execstack-needed.c | ||
| tst-execstack-prog.c | ||
| tst-execstack.c | ||
| tst-global1.c | ||
| tst-initorder2.c | ||
| tst-initorder2.exp | ||
| tst-initorder.c | ||
| tst-initorder.exp | ||
| tst-initordera1.c | ||
| tst-initordera2.c | ||
| tst-initordera3.c | ||
| tst-initordera4.c | ||
| tst-initorderb1.c | ||
| tst-initorderb2.c | ||
| tst-leaks1-static.c | ||
| tst-leaks1.c | ||
| tst-null-argv-lib.c | ||
| tst-null-argv.c | ||
| tst-order-a1.c | ||
| tst-order-a2.c | ||
| tst-order-a3.c | ||
| tst-order-a4.c | ||
| tst-order-b1.c | ||
| tst-order-b2.c | ||
| tst-order-main.c | ||
| tst-pathopt.c | ||
| tst-pathopt.sh | ||
| tst-pie1.c | ||
| tst-pie2.c | ||
| tst-piemod1.c | ||
| tst-ptrguard1-static.c | ||
| tst-ptrguard1.c | ||
| tst-relsort1.c | ||
| tst-relsort1mod1.c | ||
| tst-relsort1mod2.c | ||
| tst-rtld-load-self.sh | ||
| tst-stackguard1-static.c | ||
| tst-stackguard1.c | ||
| tst-thrlock.c | ||
| tst-tls1-static.c | ||
| tst-tls1.c | ||
| tst-tls2-static.c | ||
| tst-tls2.c | ||
| tst-tls3.c | ||
| tst-tls4.c | ||
| tst-tls5.c | ||
| tst-tls6.c | ||
| tst-tls7.c | ||
| tst-tls8.c | ||
| tst-tls9-static.c | ||
| tst-tls9.c | ||
| tst-tls10.c | ||
| tst-tls10.h | ||
| tst-tls11.c | ||
| tst-tls12.c | ||
| tst-tls13.c | ||
| tst-tls14.c | ||
| tst-tls15.c | ||
| tst-tls16.c | ||
| tst-tls17.c | ||
| tst-tls18.c | ||
| tst-tls19.c | ||
| tst-tls19mod1.c | ||
| tst-tls19mod2.c | ||
| tst-tls19mod3.c | ||
| tst-tls-dlinfo.c | ||
| tst-tlsmod1.c | ||
| tst-tlsmod2.c | ||
| tst-tlsmod3.c | ||
| tst-tlsmod4.c | ||
| tst-tlsmod5.c | ||
| tst-tlsmod6.c | ||
| tst-tlsmod7.c | ||
| tst-tlsmod8.c | ||
| tst-tlsmod9.c | ||
| tst-tlsmod10.c | ||
| tst-tlsmod11.c | ||
| tst-tlsmod12.c | ||
| tst-tlsmod13.c | ||
| tst-tlsmod13a.c | ||
| tst-tlsmod14a.c | ||
| tst-tlsmod14b.c | ||
| tst-tlsmod15a.c | ||
| tst-tlsmod15b.c | ||
| tst-tlsmod16a.c | ||
| tst-tlsmod16b.c | ||
| tst-tlsmod17a.c | ||
| tst-tlsmod17b.c | ||
| tst-tlsmod18a.c | ||
| tst-unique1.c | ||
| tst-unique1mod1.c | ||
| tst-unique1mod2.c | ||
| tst-unique2.c | ||
| tst-unique2mod1.c | ||
| tst-unique2mod2.c | ||
| tst-unique3.cc | ||
| tst-unique3.h | ||
| tst-unique3lib2.cc | ||
| tst-unique3lib.cc | ||
| tst-unique4.cc | ||
| tst-unique4.h | ||
| tst-unique4lib.cc | ||
| unload2.c | ||
| unload2dep.c | ||
| unload2mod.c | ||
| unload3.c | ||
| unload3mod1.c | ||
| unload3mod2.c | ||
| unload3mod3.c | ||
| unload3mod4.c | ||
| unload4.c | ||
| unload4mod1.c | ||
| unload4mod2.c | ||
| unload4mod3.c | ||
| unload4mod4.c | ||
| unload5.c | ||
| unload6.c | ||
| unload6mod1.c | ||
| unload6mod2.c | ||
| unload6mod3.c | ||
| unload7.c | ||
| unload7mod1.c | ||
| unload7mod2.c | ||
| unload8.c | ||
| unload8mod1.c | ||
| unload8mod1x.c | ||
| unload8mod2.c | ||
| unload8mod3.c | ||
| unload.c | ||
| unloadmod.c | ||
| Versions | ||
| vismain.c | ||
| vismod1.c | ||
| vismod2.c | ||
| vismod3.c | ||
| vismod.h | ||