nptl: Move stack list variables into _rtld_global

[thirdparty/glibc.git] / elf / Makefile

diff --git a/elf/Makefile b/elf/Makefile
index 8cdc44fdf14a28fe17ee4dd7f04d36e869f07892..2015383eb2207c60edffbe2c6d84b38fb0119ca2 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -34,7 +34,8 @@ dl-routines   = $(addprefix dl-,load lookup object reloc deps \
                                  version profile tls origin scope \
                                  execstack open close trampoline \
                                  exception sort-maps lookup-direct \
-                                 call-libc-early-init write)
+                                 call-libc-early-init write \
+                                 thread_gscope_wait)
 ifeq (yes,$(use-ldconfig))
 dl-routines += dl-cache
 endif
@@ -54,7 +55,8 @@ endif
 all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
 # But they are absent from the shared libc, because that code is in ld.so.
 elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \
-                   dl-sysdep dl-exception dl-reloc-static-pie
+                   dl-sysdep dl-exception dl-reloc-static-pie \
+                   thread_gscope_wait
 
 # ld.so uses those routines, plus some special stuff for being the program
 # interpreter and operating independent of libc.
@@ -661,7 +663,8 @@ libof-ldconfig = ldconfig
 CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)
 CFLAGS-cache.c += $(SYSCONF-FLAGS)
 CFLAGS-rtld.c += $(SYSCONF-FLAGS)
-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS)
+CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \
+  -D'RTLD="$(rtlddir)/$(rtld-installed-name)"'
 
 cpp-srcs-left := $(all-rtld-routines:=.os)
 lib := rtld