Makeconfig (ASFLAGS): Always append required assembler flags

Otherwise, it is impossible to set ASFLAGS differently from CFLAGS
without also overriding essential flags such as -Wa,--noexecstack.

diff --git a/ChangeLog b/ChangeLog
index 8af30250f61c6583cac91d8fe549e818280c9795..45520095d37d61abc44725d939995dc74d7d091c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-16  Florian Weimer  <fweimer@redhat.com>
+
+       * Makeconfig (ASFLAGS): Always append required assembler flags.
+
 2018-08-16  Moritz Eckert  <m.eckert@cs.ucsb.edu>
 
        * malloc/malloc.c (_int_free): Check for corrupt prev_size vs size.

diff --git a/Makeconfig b/Makeconfig
index 608ffe648c80c724f756162aa95fe58de3afffa9..099f1840885174d23ea2fc155622f579f8ed04b6 100644 (file)
--- 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)