This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-8-gac9e0e5
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Feb 2015 18:42:44 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-8-gac9e0e5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ac9e0e5e401fa634667a8284a0db0ca886bf816b (commit)
from ebda2f17ffc735f7daa67f752ec454b3f305e392 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ac9e0e5e401fa634667a8284a0db0ca886bf816b
commit ac9e0e5e401fa634667a8284a0db0ca886bf816b
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Feb 6 10:42:08 2015 -0800
Clean up sysdep-dl-routines variable.
diff --git a/ChangeLog b/ChangeLog
index 8fa864c..22b9d98 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 e5b142c..f2d1781 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 5af7a16..0632355 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 f72cce0..17c129b 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 078f90a..ace6eb9 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 e1deece..c8af591 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 09e41f2..5ebca89 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 f2f28ee..6b4e620 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 f1049c3..359e0c2 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 de27824..61c355a 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 25fb18b..8127025 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 dd5d3bc..fcf3bb5 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 6d360c0..1c1cfff 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 32b36d5..ef70a50 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 27 +++++++++++++++++++++++++++
elf/Makefile | 4 ++--
sysdeps/aarch64/Makefile | 2 --
sysdeps/arm/Makefile | 4 ++--
sysdeps/hppa/Makefile | 2 --
sysdeps/i386/Makefile | 2 --
sysdeps/ia64/Makefile | 2 --
sysdeps/unix/sysv/linux/aarch64/Makefile | 2 --
sysdeps/unix/sysv/linux/ia64/Makefile | 2 --
sysdeps/unix/sysv/linux/m68k/Makefile | 4 ++--
sysdeps/unix/sysv/linux/mips/Makefile | 2 --
sysdeps/unix/sysv/linux/powerpc/Makefile | 2 --
sysdeps/unix/sysv/linux/tile/Makefile | 2 --
sysdeps/x86_64/Makefile | 2 --
14 files changed, 33 insertions(+), 26 deletions(-)
hooks/post-receive
--
GNU C Library master sources