[8/8] 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.
---
 nptl/Makefile                         | 21 +++++++--------------
 sysdeps/mips/Makefile                 |  2 --
 sysdeps/unix/sysv/linux/Makefile      |  6 ------
 sysdeps/unix/sysv/linux/i386/Makefile |  1 -
 4 files changed, 7 insertions(+), 23 deletions(-)
  

On 21/05/2021 09:46, Florian Weimer via Libc-alpha wrote:
> Since the variable expands to nothing under Linux, it is no longer
> necessary to clutter the makefiles with it.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  nptl/Makefile                         | 21 +++++++--------------
>  sysdeps/mips/Makefile                 |  2 --
>  sysdeps/unix/sysv/linux/Makefile      |  6 ------
>  sysdeps/unix/sysv/linux/i386/Makefile |  1 -
>  4 files changed, 7 insertions(+), 23 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 52d1d193d9..060d6eebd6 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)

Ok.

> @@ -501,7 +495,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 \

Ok.

> @@ -514,19 +508,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
>  

Ok.

> @@ -540,7 +533,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

Ok.

> diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile
> index 19e6a57622..150518bc6d 100644
> --- a/sysdeps/mips/Makefile
> +++ b/sysdeps/mips/Makefile
> @@ -72,8 +72,6 @@ endif
>  ifeq ($(mips-mode-switch),yes)
>  ifeq ($(o32-fpabi),xx)
>  tests += tst-mode-switch-1 tst-mode-switch-2 tst-mode-switch-3
> -$(objpfx)tst-mode-switch-1: $(shared-thread-library)
> -$(objpfx)tst-mode-switch-2: $(shared-thread-library)
>  endif
>  endif
>  endif

Ok.

> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index fb155cf856..e9566e028a 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -179,8 +179,6 @@ $(objpfx)tst-glibcsyscalls.out: \
>  # Separate object file for access to the constant from the UAPI header.
>  $(objpfx)tst-sysconf-iov_max: $(objpfx)tst-sysconf-iov_max-uapi.o
>  
> -$(objpfx)tst-pkey: $(shared-thread-library)
> -
>  tests-special += $(objpfx)tst-mman-consts.out
>  $(objpfx)tst-mman-consts.out: ../sysdeps/unix/sysv/linux/tst-mman-consts.py
>  	$(sysdeps-linux-python) \

Ok.

> @@ -189,10 +187,6 @@ $(objpfx)tst-mman-consts.out: ../sysdeps/unix/sysv/linux/tst-mman-consts.py
>  	  < /dev/null > $@ 2>&1; $(evaluate-test)
>  $(objpfx)tst-mman-consts.out: $(sysdeps-linux-python-deps)
>  
> -$(objpfx)tst-gettid: $(shared-thread-library)
> -$(objpfx)tst-gettid-kill: $(shared-thread-library)
> -$(objpfx)tst-tgkill: $(shared-thread-library)
> -
>  endif # $(subdir) == misc
>  
>  ifeq ($(subdir),time)

Ok.

> diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
> index 26e0a8852b..abd0009d58 100644
> --- a/sysdeps/unix/sysv/linux/i386/Makefile
> +++ b/sysdeps/unix/sysv/linux/i386/Makefile
> @@ -5,7 +5,6 @@ ifeq ($(subdir),misc)
>  sysdep_routines += ioperm iopl vm86
>  
>  tests += tst-bz21269
> -$(objpfx)tst-bz21269: $(shared-thread-library)
>  endif
>  
>  ifeq ($(subdir),elf)
> 


Ok.