forked from rpms/glibc
26 lines
765 B
Diff
26 lines
765 B
Diff
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Wed Jul 4 16:16:57 2018 +0200
|
||
|
|
|
||
|
|
Makeconfig (ASFLAGS): Always append required assembler flags.
|
||
|
|
|
||
|
|
Submitted upstream here:
|
||
|
|
|
||
|
|
https://sourceware.org/ml/libc-alpha/2018-07/msg00077.html
|
||
|
|
|
||
|
|
Otherwise, we lose essential flags such as -Wa,--noexecstack due to
|
||
|
|
the way += works in make due to the ASFLAGS command line override.
|
||
|
|
|
||
|
|
diff --git a/Makeconfig b/Makeconfig
|
||
|
|
index b0b27f0113ac18b8..92e76d6200bbcd5b 100644
|
||
|
|
--- a/Makeconfig
|
||
|
|
+++ b/Makeconfig
|
||
|
|
@@ -1047,7 +1047,7 @@ endif
|
||
|
|
ifndef ASFLAGS
|
||
|
|
ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
|
||
|
|
endif
|
||
|
|
-ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
|
||
|
|
+override ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
|
||
|
|
|
||
|
|
ifndef BUILD_CC
|
||
|
|
BUILD_CC = $(CC)
|