diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | elf/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/aarch64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/arm/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/hppa/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/i386/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/ia64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tile/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/Makefile | 2 |
14 files changed, 33 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog index 8fa864c2a6..22b9d98018 100644 --- 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 e5b142c7c6..f2d1781916 100644 --- 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 5af7a1655e..06323550e9 100644 --- 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 f72cce0919..17c129b2e1 100644 --- 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 078f90a60c..ace6eb963c 100644 --- 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 e1deecee87..c8af591d27 100644 --- 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 09e41f2417..5ebca89afa 100644 --- 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 f2f28eeda9..6b4e620896 100644 --- 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 f1049c3c47..359e0c26f6 100644 --- 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 de27824a57..61c355ac2a 100644 --- 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 25fb18b3dd..8127025503 100644 --- 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 dd5d3bcaa6..fcf3bb55ed 100644 --- 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 6d360c0b64..1c1cfff280 100644 --- 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 32b36d5ce2..ef70a50c84 100644 --- 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 |