1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 13270c0a9336..8c31fbc90589 100644
--- a/Makefile
+++ b/Makefile
@@ -780,10 +780,11 @@ endif
 include scripts/Makefile.kasan
 include scripts/Makefile.extrawarn
-# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
+# Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the
-KBUILD_CPPFLAGS += $(KCPPFLAGS)
+# last assignments
-KBUILD_AFLAGS += $(KAFLAGS)
+KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS)
-KBUILD_CFLAGS += $(KCFLAGS)
+KBUILD_AFLAGS   += $(ARCH_AFLAGS)   $(KAFLAGS)
+KBUILD_CFLAGS   += $(ARCH_CFLAGS)   $(KCFLAGS)
 # Use --build-id when available.
 LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\

diff --git a/Makefile b/Makefile index 13270c0a9336..8c31fbc90589 100644 --- a/Makefile +++ b/Makefile
@@ -780,10 +780,11 @@ endif
780	include scripts/Makefile.kasan	780	include scripts/Makefile.kasan
781	include scripts/Makefile.extrawarn	781	include scripts/Makefile.extrawarn
782		782
783	# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments	783	# Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the
784	KBUILD_CPPFLAGS += $(KCPPFLAGS)	784	# last assignments
785	KBUILD_AFLAGS += $(KAFLAGS)	785	KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS)
786	KBUILD_CFLAGS += $(KCFLAGS)	786	KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS)
		787	KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)
787		788
788	# Use --build-id when available.	789	# Use --build-id when available.
789	LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\	790	LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\