From 5057feffccb8970585e63b336e13fc878803af02 Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Sun, 13 Mar 2016 15:16:51 +0000
Subject: [PATCH] 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.
---
 ChangeLog              | 6 ++++++
 elf/rtld-Rules         | 2 +-
 scripts/sysd-rules.awk | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c01a727c3..7a20eb3e51 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 94ca39bff2..c1bb50687e 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 cebc9d3e1b..69af400e58 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) {