From 79520f4bd611602f5bdb2b50979cf75bb5ac2968 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 16 May 2014 21:38:08 +0000 Subject: Use existing makefile variables for dependencies on glibc libraries. 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. --- ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ benchtests/Makefile | 5 ++--- elf/Makefile | 4 ++-- malloc/Makefile | 2 +- math/Makefile | 8 ++------ misc/Makefile | 6 +----- nptl/Makefile | 2 +- setjmp/Makefile | 7 +------ stdio-common/Makefile | 7 +------ stdlib/Makefile | 18 ++++++------------ 10 files changed, 55 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91e3a4669e..6a6881d85e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2014-05-16 Joseph Myers + + * 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. + 2014-05-16 Adhemerval Zanella * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_MISC]: Guard diff --git a/benchtests/Makefile b/benchtests/Makefile index a0954cdbc7..63a5a7fd6b 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -44,9 +44,8 @@ benchset := $(string-bench-all) $(stdlib-bench) CFLAGS-bench-ffs.c += -fno-builtin CFLAGS-bench-ffsll.c += -fno-builtin -$(addprefix $(objpfx)bench-,$(bench-math)): $(common-objpfx)math/libm.so -$(addprefix $(objpfx)bench-,$(bench-pthread)): \ - $(common-objpfx)nptl/libpthread.so +$(addprefix $(objpfx)bench-,$(bench-math)): $(libm) +$(addprefix $(objpfx)bench-,$(bench-pthread)): $(shared-thread-library) diff --git a/elf/Makefile b/elf/Makefile index 084abcaf2c..4dcc78a163 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -653,7 +653,7 @@ $(objpfx)vismain: $(addprefix $(objpfx),vismod1.so vismod2.so) $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) -$(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so +$(objpfx)noload: $(objpfx)testobj1.so $(libdl) LDFLAGS-noload = -rdynamic $(no-as-needed) $(objpfx)noload.out: $(objpfx)testobj5.so @@ -1011,7 +1011,7 @@ $(objpfx)tst-audit9: $(libdl) $(objpfx)tst-audit9.out: $(objpfx)tst-auditmod9a.so $(objpfx)tst-auditmod9b.so tst-audit9-ENV = LD_AUDIT=$(objpfx)tst-auditmod9a.so -$(objpfx)tst-audit8: $(common-objpfx)math/libm.so +$(objpfx)tst-audit8: $(libm) $(objpfx)tst-audit8.out: $(objpfx)tst-auditmod1.so tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so diff --git a/malloc/Makefile b/malloc/Makefile index d962331e12..7a716f983f 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -148,7 +148,7 @@ $(objpfx)memusage: memusage.sh # The implementation uses `dlsym' -$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so +$(objpfx)libmemusage.so: $(libdl) # Extra dependencies $(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c diff --git a/math/Makefile b/math/Makefile index c13ca80cf8..f337a0ef54 100644 --- a/math/Makefile +++ b/math/Makefile @@ -219,12 +219,8 @@ $(objpfx)libieee.a: $(objpfx)ieee-math.o $(patsubst %/,cd % &&,$(objpfx)) \ $(LN_S) $( $@; \ $(evaluate-test) -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)tst-printf-round: $(link-libm) +$(objpfx)tst-printf-round: $(libm) diff --git a/stdlib/Makefile b/stdlib/Makefile index 42482a2a6c..d7a562f6dc 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -150,19 +150,13 @@ $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps) $(build-module) CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)bug-getcontext: $(link-libm) -$(objpfx)tst-strtod-round: $(link-libm) -$(objpfx)tst-tininess: $(link-libm) -$(objpfx)tst-strtod-underflow: $(link-libm) -$(objpfx)tst-strtod6: $(link-libm) +$(objpfx)bug-getcontext: $(libm) +$(objpfx)tst-strtod-round: $(libm) +$(objpfx)tst-tininess: $(libm) +$(objpfx)tst-strtod-underflow: $(libm) +$(objpfx)tst-strtod6: $(libm) tst-tls-atexit-lib.so-no-z-defs = yes -$(objpfx)tst-tls-atexit: $(common-objpfx)nptl/libpthread.so \ - $(common-objpfx)dlfcn/libdl.so +$(objpfx)tst-tls-atexit: $(shared-thread-library) $(libdl) $(objpfx)tst-tls-atexit.out: $(objpfx)tst-tls-atexit-lib.so -- cgit v1.2.3