diff mbox

kbuild: set no-integrated-as before incl. arch Makefile

Message ID 20180319211253.3172-1-stefan@agner.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Stefan Agner March 19, 2018, 9:12 p.m. UTC 
In order to make sure compiler flag detection for ARM works
correctly the no-integrated-as flags need to be set before
including the arch specific Makefile.

Fixes: cfe17c9bbe6a ("kbuild: move cc-option and cc-disable-warning after incl. arch Makefile")
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada March 20, 2018, 3:33 p.m. UTC | #1 
2018-03-20 6:12 GMT+09:00 Stefan Agner <stefan@agner.ch>:
> In order to make sure compiler flag detection for ARM works
> correctly the no-integrated-as flags need to be set before
> including the arch specific Makefile.
>
> Fixes: cfe17c9bbe6a ("kbuild: move cc-option and cc-disable-warning after incl. arch Makefile")
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---

Applied to linux-kbuild. Thanks!
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 56f76a5cd006..0474803c65f7 100644
--- a/Makefile
+++ b/Makefile
@@ -487,6 +487,8 @@  CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)
 endif
 KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
 KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
+KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
+KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
 endif
 
 RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
@@ -744,8 +746,6 @@  KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
 # See modpost pattern 2
 KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
 KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
-KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
-KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
 else
 
 # These warnings generated too much noise in a regular build.