This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/dynamic-test updated. glibc-2.16-ports-merge-449-g04b46f4
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Oct 2012 16:45:51 -0000
- Subject: GNU C Library master sources branch hjl/dynamic-test updated. glibc-2.16-ports-merge-449-g04b46f4
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, hjl/dynamic-test has been updated
via 04b46f459c1a7e4b30cecee893b6e9bb84af048c (commit)
from 0ec7da06469b7f4125ea5c444943a9ed81c9eecb (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=04b46f459c1a7e4b30cecee893b6e9bb84af048c
commit 04b46f459c1a7e4b30cecee893b6e9bb84af048c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Oct 8 09:45:25 2012 -0700
Link PIE tests with newly built glibc
diff --git a/ChangeLog.dynamic-test b/ChangeLog.dynamic-test
index b6820c0..bedd0ce 100644
--- a/ChangeLog.dynamic-test
+++ b/ChangeLog.dynamic-test
@@ -1,5 +1,16 @@
2012-10-08 H.J. Lu <hongjiu.lu@intel.com>
+ * Makeconfig (+link-pie-before-libc): New.
+ (+link-pie-after-libc): Likewise.
+ (+link-pie-tests): Likewise.
+ (+link-pie): Rewritten.
+ * Rules (binaries-pie-tests): New.
+ (binaries-pie-notests): Likewise.
+ (binaries-pie): Rewritten.
+ ($(addprefix $(objpfx),$(binaries-pie))): Renamed to ...
+ ($(addprefix $(objpfx),$(binaries-pie-notests))): This.
+ ($(addprefix $(objpfx),$(binaries-pie-tests))): New.
+
* posix/Makefile (tests-static): New.
(tests): Add $(tests-static).
(tst-exec-ARGS): Replace $(built-program-cmd) with
diff --git a/Makeconfig b/Makeconfig
index ac7b5ae..c0e88c9 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -413,8 +413,8 @@ endif
# Command for linking PIE programs with the C library.
ifndef +link-pie
-+link-pie = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
- $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
++link-pie-before-libc = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
+ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
$(addprefix $(csu-objpfx),S$(start-installed-name)) \
$(+preinit) $(+prectorS) \
@@ -422,7 +422,12 @@ ifndef +link-pie
S$(start-installed-name))\
$(+preinit) $(link-extra-libs) \
$(common-objpfx)libc% $(+postinit),$^) \
- $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+ $(link-extra-libs)
++link-pie-after-libc = $(+postctorS) $(+postinit)
++link-pie = $(+link-pie-before-libc) $(rtld-LDFLAGS) $(link-libc) \
+ $(+link-pie-after-libc)
++link-pie-tests = $(+link-pie-before-libc) $(rtld-tests-LDFLAGS) \
+ $(link-libc-tests) $(+link-pie-after-libc)
endif
# Command for statically linking programs with the C library.
ifndef +link-static
diff --git a/Rules b/Rules
index 91a93eb..2364ae6 100644
--- a/Rules
+++ b/Rules
@@ -109,9 +109,11 @@ binaries-static-notests = $(others-static)
binaries-static-tests = $(tests-static) $(xtests-static)
binaries-static = $(binaries-static-notests) $(binaries-static-tests)
ifeq (yesyes,$(have-fpie)$(build-shared))
-binaries-pie = $(others-pie) $(tests-pie) $(xtests-pie)
+binaries-pie-tests = $(tests-pie) $(xtests-pie)
+binaries-pie-notests = $(others-pie)
else
-binaries-pie =
+binaries-pie-tests =
+binaries-pie-notests =
endif
else
binaries-all-notests =
@@ -120,9 +122,11 @@ binaries-all = $(binaries-all-tests)
binaries-static-notests =
binaries-static-tests =
binaries-static =
-binaries-pie =
+binaries-pie-tests =
+binaries-pie-notests =
endif
+binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static), \
$(binaries-all-tests))
binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
@@ -142,8 +146,15 @@ $(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
$(+link-tests)
endif
-ifneq "$(strip $(binaries-pie))" ""
-$(addprefix $(objpfx),$(binaries-pie)): %: %.o \
+ifneq "$(strip $(binaries-pie-tests))" ""
+$(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
+ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
+ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
+ $(+link-pie-tests)
+endif
+
+ifneq "$(strip $(binaries-pie-notests))" ""
+$(addprefix $(objpfx),$(binaries-pie-notests)): %: %.o \
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
$(+link-pie)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.dynamic-test | 11 +++++++++++
Makeconfig | 11 ++++++++---
Rules | 21 ++++++++++++++++-----
3 files changed, 35 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources