Clean up sysdep-dl-routines variable.

diff --git a/ChangeLog b/ChangeLog
index 8fa864c2a68ef2ffdef2555115436a84551fdae9..22b9d9801859fb5586ff3db1ad58f3fb61e2a01e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2015-02-06  Roland McGrath  <roland@hack.frob.com>
+
+       * elf/Makefile (routines): Include $(all-dl-routines), not just
+       $(dl-routines).
+       (rtld-routines): Likewise.  Use = rather than :=.
+       * sysdeps/aarch64/Makefile [$(subdir) = elf]
+       (sysdep_routines, sysdep-rtld-routines): Don't add tlsdesc and
+       dl-tlsdesc to these; sysdep-dl-routines alone is enough.
+       * sysdeps/arm/Makefile: Likewise.
+       * sysdeps/i386/Makefile: Likewise.
+       * sysdeps/x86_64/Makefile: Likewise.
+       * sysdeps/hppa/Makefile [$(subdir) = elf]
+       (sysdep_routines, sysdep-rtld-routines): Don't add
+       $(sysdep-dl-routines) to these.
+       * sysdeps/ia64/Makefile: Likewise.
+       * sysdeps/unix/sysv/linux/ia64/Makefile: Likewise.
+       * sysdeps/unix/sysv/linux/aarch64/Makefile [$(subdir) = elf]
+       [$(build-shared) = yes] (sysdep_routines, sysdep-rtld-routines):
+       Don't add dl-static to these; sysdep-dl-routines alone is enough.
+       * sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
+       * sysdeps/unix/sysv/linux/mips/Makefile: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/Makefile: Likewise.
+       * sysdeps/unix/sysv/linux/tile/Makefile: Likewise.
+       * sysdeps/powerpc/Makefile [$(subdir) = elf]
+       (sysdep_routines, sysdep-rtld-routines): Don't add dl-machine to
+       these; sysdep-dl-routines alone is enough.
+
 2015-02-06  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #17932]

diff --git a/elf/Makefile b/elf/Makefile
index e5b142c7c675edf37d5b16f740e032f68fa4de94..f2d1781916da2dfd79350239038fccaed5da7a83 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -22,7 +22,7 @@ subdir                := elf
 include ../Makeconfig
 
 headers                = elf.h bits/elfclass.h link.h bits/link.h
-routines       = $(dl-routines) dl-support dl-iteratephdr \
+routines       = $(all-dl-routines) dl-support dl-iteratephdr \
                  dl-addr enbl-secure dl-profstub \
                  dl-origin dl-libc dl-sym dl-tsd dl-sysdep
 
@@ -43,7 +43,7 @@ shared-only-routines += dl-caller
 
 # ld.so uses those routines, plus some special stuff for being the program
 # interpreter and operating independent of libc.
-rtld-routines  := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
+rtld-routines  = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal
 all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
 
 CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables

diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile
index 5af7a1655ee757c4ca4ab3f82ff65f4703470c6a..06323550e947caa282a58e0dcf57888e8cf789d7 100644 (file)
--- a/sysdeps/aarch64/Makefile
+++ b/sysdeps/aarch64/Makefile
@@ -6,8 +6,6 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
-sysdep_routines += tlsdesc dl-tlsdesc
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
 gen-as-const-headers += dl-link.sym
 endif
 

diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
index f72cce09190c9a15ac6fe5498a4dc473f415daf0..17c129b2e15c6150886acc17c9e7b38ec0133f8d 100644 (file)
--- a/sysdeps/arm/Makefile
+++ b/sysdeps/arm/Makefile
@@ -3,8 +3,8 @@ static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
-sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
-sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
+sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx
+sysdep-rtld-routines += aeabi_unwind_cpp_pr1
 shared-only-routines += aeabi_unwind_cpp_pr1
 
 $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os

diff --git a/sysdeps/hppa/Makefile b/sysdeps/hppa/Makefile
index 078f90a60c84937b99cde31668a55572d39167fe..ace6eb963cb6b34aaae78f1a22cb420ea61c9708 100644 (file)
--- a/sysdeps/hppa/Makefile
+++ b/sysdeps/hppa/Makefile
@@ -26,8 +26,6 @@ CFLAGS-rtld.c += -mdisable-fpregs
 sysdep-dl-routines += dl-symaddr dl-fptr
 # dl-fptr.c needs a complete rewrite to fix ISO C aliasing violations.
 CFLAGS-dl-fptr.c = -Wno-error
-sysdep_routines += $(sysdep-dl-routines)
-sysdep-rtld-routines += $(sysdep-dl-routines)
 endif
 
 ifeq ($(subdir),csu)

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index e1deecee87e6268c180374c0cdde75b0b870b0aa..c8af591d27476cb87c10326ecdee976f8516cbac 100644 (file)
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -66,8 +66,6 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
-sysdep_routines += tlsdesc dl-tlsdesc
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
 endif
 
 ifeq ($(subdir),csu)

diff --git a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile
index 09e41f2417fab8361e938e81055801cd9fadf94a..5ebca89afaaefce53661d63971b88de3edcf92d5 100644 (file)
--- a/sysdeps/ia64/Makefile
+++ b/sysdeps/ia64/Makefile
@@ -17,6 +17,4 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += dl-symaddr dl-fptr
-sysdep_routines += $(sysdep-dl-routines)
-sysdep-rtld-routines += $(sysdep-dl-routines)
 endif

diff --git a/sysdeps/unix/sysv/linux/aarch64/Makefile b/sysdeps/unix/sysv/linux/aarch64/Makefile
index f2f28eeda98416c3768fa611a059f6ac65c40442..6b4e620896b825cb549a4d621d3ef28fad90eb83 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/Makefile
+++ b/sysdeps/unix/sysv/linux/aarch64/Makefile
@@ -10,8 +10,6 @@ sysdep-rtld-routines += __read_tp
 ifeq ($(build-shared),yes)
 # This is needed for DSO loading from static binaries.
 sysdep-dl-routines += dl-static
-sysdep_routines += dl-static
-sysdep-rtld-routines += dl-static
 endif
 endif
 

diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index f1049c3c47d3e9ce94cde5bc44d81e4864bd4b76..359e0c26f699f62be8b16c2126fdd310c2f860eb 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -15,8 +15,6 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += dl-static
-sysdep_routines += $(sysdep-dl-routines)
-sysdep-rtld-routines += $(sysdep-dl-routines)
 endif
 
 ifeq ($(subdir),rt)

diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile
index de27824a5754c51766ca59f761fd69c7a7aa64cc..61c355ac2a49d83855d1ef505052df5e29700aa8 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/Makefile
+++ b/sysdeps/unix/sysv/linux/m68k/Makefile
@@ -13,8 +13,8 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += dl-static
-sysdep_routines += dl-vdso libc-m68k-vdso dl-static
-sysdep-rtld-routines += m68k-vdso dl-static
+sysdep_routines += dl-vdso libc-m68k-vdso
+sysdep-rtld-routines += m68k-vdso
 sysdep-others += lddlibc4
 install-bin += lddlibc4
 endif

diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index 25fb18b3ddee84103d2db6f629337dbfb98a8ddf..81270255035798cb1ca4c528411c8afe8d55b3ae 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -96,8 +96,6 @@ ifeq ($(subdir),elf)
 ifeq ($(build-shared),yes)
 # This is needed for DSO loading from static binaries.
 sysdep-dl-routines += dl-static
-sysdep_routines += dl-static
-sysdep-rtld-routines += dl-static
 endif
 endif
 

diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile
index dd5d3bcaa602ee0b7a00e62ae70c2e97dd316588..fcf3bb55edb391ffdcba36419c2e2afbf45162a1 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/Makefile
@@ -19,8 +19,6 @@ sysdep_routines += dl-vdso
 ifeq ($(build-shared),yes)
 # This is needed for DSO loading from static binaries.
 sysdep-dl-routines += dl-static
-sysdep_routines += dl-static
-sysdep-rtld-routines += dl-static
 endif
 endif
 

diff --git a/sysdeps/unix/sysv/linux/tile/Makefile b/sysdeps/unix/sysv/linux/tile/Makefile
index 6d360c0b64734a6210c689b2b6749bf2bf1e2a09..1c1cfff2800e55d11cfdfc4d884a39ee565f00fb 100644 (file)
--- a/sysdeps/unix/sysv/linux/tile/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/Makefile
@@ -19,8 +19,6 @@ sysdep_routines += dl-vdso
 ifeq ($(build-shared),yes)
 # This is needed for DSO loading from static binaries.
 sysdep-dl-routines += dl-static
-sysdep_routines += dl-static
-sysdep-rtld-routines += dl-static
 endif
 endif
 

diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index 32b36d5ce20cb04ef4450187b26e4c80b68a5043..ef70a50c843b49a442ae6261a424c71a4bbf53f1 100644 (file)
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -20,8 +20,6 @@ endif
 
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
-sysdep_routines += tlsdesc dl-tlsdesc
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
 
 tests += tst-quad1 tst-quad2
 modules-names += tst-quadmod1 tst-quadmod2