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