diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-25 11:30:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-25 11:30:23 +0200 |
| commit | ac0353af81a23535f517586a5d04427120a157ac (patch) | |
| tree | d0ddb24d8ca52ed408dc3d0ef221daf7fd47c4a5 /nptl | |
| parent | 3b638095a575451b3c92ebd0b45f11578d07f26d (diff) | |
| download | glibc-ac0353af81a23535f517586a5d04427120a157ac.tar.gz glibc-ac0353af81a23535f517586a5d04427120a157ac.tar.xz glibc-ac0353af81a23535f517586a5d04427120a157ac.zip | |
Linux: Remove remaining references to $(shared-thread-library)
Since the variable expands to nothing under Linux, it is no longer necessary to clutter the makefiles with it. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 6697ba8dd4..16eaf58948 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -371,12 +371,6 @@ CPPFLAGS-tst-pthread-gdb-attach-static.c := \ # were launched with an explicit ld.so invocation. tst-pthread-gdb-attach-no-pie = yes -ifeq ($(build-shared),yes) -tests-printers-libs := $(shared-thread-library) -else -tests-printers-libs := $(static-thread-library) -endif - tests += tst-cancelx7 tst-cancelx17 ifeq ($(build-shared),yes) @@ -502,7 +496,7 @@ $(objpfx)tst-stack3-mem.out: $(objpfx)tst-stack3.out $(evaluate-test) generated += tst-stack3-mem.out tst-stack3.mtrace -$(objpfx)tst-stack4: $(libdl) $(shared-thread-library) +$(objpfx)tst-stack4: $(libdl) tst-stack4mod.sos=$(shell for i in 0 1 2 3 4 5 6 7 8 9 10 \ 11 12 13 14 15 16 17 18 19; do \ for j in 0 1 2 3 4 5 6 7 8 9 10 \ @@ -515,19 +509,18 @@ $(tst-stack4mod.sos): $(objpfx)tst-stack4mod.so clean: rm -f $(tst-stack4mod.sos) -$(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library) -$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanupx4aux.o $(shared-thread-library) +$(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o +$(objpfx)tst-cleanupx4: $(objpfx)tst-cleanupx4aux.o -$(objpfx)tst-tls3: $(libdl) $(shared-thread-library) +$(objpfx)tst-tls3: $(libdl) LDFLAGS-tst-tls3 = -rdynamic $(objpfx)tst-tls3.out: $(objpfx)tst-tls3mod.so -$(objpfx)tst-tls3mod.so: $(shared-thread-library) -$(objpfx)tst-tls3-malloc: $(libdl) $(shared-thread-library) +$(objpfx)tst-tls3-malloc: $(libdl) LDFLAGS-tst-tls3-malloc = -rdynamic $(objpfx)tst-tls3-malloc.out: $(objpfx)tst-tls3mod.so -$(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) +$(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so LDFLAGS-tst-tls5 = -Wl,--no-as-needed LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so @@ -541,7 +534,7 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(evaluate-test) endif -$(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library) +$(objpfx)tst-dlsym1: $(libdl) ifeq (yes,$(build-shared)) librt = $(common-objpfx)rt/librt.so |