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.
This commit is contained in:
Nick Alcock 2016-03-13 15:16:51 +00:00 committed by Mike Frysinger
parent 1a5d01e79e
commit 5057feffcc
3 changed files with 8 additions and 2 deletions

View File

@ -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]

View File

@ -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-%

View File

@ -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) {