From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 17 Aug 2018 09:35:42 +0000 (+0200)
Subject: Makeconfig (ASFLAGS): Always append required assembler flags
X-Git-Tag: glibc-2.29~522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a2584cd2ffb2a6e4b17682ba250889059f5d8b;p=thirdparty%2Fglibc.git

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 8af30250f61..45520095d37 100644
--- 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 608ffe648c8..099f1840885 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)