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