diff options
| -rw-r--r-- | ChangeLog | 38 | ||||
| -rw-r--r-- | benchtests/Makefile | 5 | ||||
| -rw-r--r-- | elf/Makefile | 4 | ||||
| -rw-r--r-- | malloc/Makefile | 2 | ||||
| -rw-r--r-- | math/Makefile | 8 | ||||
| -rw-r--r-- | misc/Makefile | 6 | ||||
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | setjmp/Makefile | 7 | ||||
| -rw-r--r-- | stdio-common/Makefile | 7 | ||||
| -rw-r--r-- | 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 <joseph@codesourcery.com> + + * 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 <azanella@linux.vnet.ibm.com> * 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) $(<F) $(@F) -ifeq ($(build-shared),yes) -$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(objpfx)libm.so$(libm.so-version) +$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(libm) $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a -else -$(addprefix $(objpfx),$(tests)): $(objpfx)libm.a -endif gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\ add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \ @@ -233,4 +229,4 @@ gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\ $(objpfx)atest-exp: $(gmp-objs) $(objpfx)atest-sincos: $(gmp-objs) $(objpfx)atest-exp2: $(gmp-objs) -$(objpfx)test-fenv-tls: $(common-objpfx)nptl/libpthread.so +$(objpfx)test-fenv-tls: $(shared-thread-library) diff --git a/misc/Makefile b/misc/Makefile index 53d4c2ce44..edac24cfc2 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -102,11 +102,7 @@ include ../Rules $(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib) -ifeq ($(build-shared),yes) -$(objpfx)tst-tsearch: $(common-objpfx)math/libm.so$(libm.so-version) -else -$(objpfx)tst-tsearch: $(common-objpfx)math/libm.a -endif +$(objpfx)tst-tsearch: $(libm) tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace tst-error1-ARGS = $(objpfx)tst-error1.out diff --git a/nptl/Makefile b/nptl/Makefile index 287622475d..7551406cfb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -530,7 +530,7 @@ $(addprefix $(objpfx), \ $(tests-nolibpthread), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a -$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so +$(objpfx)tst-unload: $(libdl) # $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so, # since otherwise libpthread.so comes before libc.so when linking. $(addprefix $(objpfx), $(tests-reverse)): \ diff --git a/setjmp/Makefile b/setjmp/Makefile index fe0fb5dc6d..047b9ec9f2 100644 --- a/setjmp/Makefile +++ b/setjmp/Makefile @@ -33,9 +33,4 @@ tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \ include ../Rules -ifeq ($(build-shared),yes) -link-libm = $(common-objpfx)math/libm.so -else -link-libm = $(common-objpfx)math/libm.a -endif -$(objpfx)tst-setjmp-fp: $(link-libm) +$(objpfx)tst-setjmp-fp: $(libm) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 332f205bcf..f179eab508 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -137,9 +137,4 @@ $(objpfx)tst-setvbuf1-cmp.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1.out cmp $^ > $@; \ $(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 |