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.23-170-g5057fef
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Apr 2016 03:53:01 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-170-g5057fef
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 5057feffccb8970585e63b336e13fc878803af02 (commit)
from 1a5d01e79e40485e2e78ceb25f124a5ee31415fc (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=5057feffccb8970585e63b336e13fc878803af02
commit 5057feffccb8970585e63b336e13fc878803af02
Author: Nick Alcock <nick.alcock@oracle.com>
Date: Sun Mar 13 15:16:51 2016 +0000
Allow overriding of CFLAGS as well as CPPFLAGS for rtld.
We need this to pass -fno-stack-protector to all the pieces of rtld in
non-elf/ directories.
diff --git a/ChangeLog b/ChangeLog
index 7c01a72..7a20eb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-09 Nick Alcock <nick.alcock@oracle.com>
+
+ * elf/rtld-Rules (rtld-compile-command.c): Add $(rtld-CFLAGS).
+ * scripts/sysd-rules.awk: Substitute in $(CFLAGS) as well as
+ $(CPPFLAGS).
+
2016-04-09 Khem Raj <raj.khem@gmail.com>
[BZ #17950]
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 94ca39b..c1bb506 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -90,7 +90,7 @@ else
rtld-compile-command.S = $(compile-command.S) $(rtld-CPPFLAGS)
rtld-compile-command.s = $(compile-command.s) $(rtld-CPPFLAGS)
-rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS)
+rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS) $(rtld-CFLAGS)
# These are the basic compilation rules corresponding to the Makerules ones.
# The sysd-rules generated makefile already defines pattern rules for rtld-%
diff --git a/scripts/sysd-rules.awk b/scripts/sysd-rules.awk
index cebc9d3..69af400 100644
--- a/scripts/sysd-rules.awk
+++ b/scripts/sysd-rules.awk
@@ -54,7 +54,7 @@ BEGIN {
command_suffix = "";
} else {
prefix = gensub(/%/, "", 1, target_pattern);
- command_suffix = " $(" prefix "CPPFLAGS)";
+ command_suffix = " $(" prefix "CPPFLAGS)" " $(" prefix "CFLAGS)";
}
target = "$(objpfx)" target_pattern o ":";
if (asm_rules) {
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
elf/rtld-Rules | 2 +-
scripts/sysd-rules.awk | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources