summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-03-19 22:12:53 +0100
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-21 18:20:11 +0900
commit0f0e8de334c54c38818a4a5390a39aa09deff5bf (patch)
tree90c66682b4793e1e249fc33ecbf143cbd70feb02 /Makefile
parent825d487583089f9a33d31650c9c41f6474aab7fc (diff)
downloadlinux-0f0e8de334c54c38818a4a5390a39aa09deff5bf.tar.gz
linux-0f0e8de334c54c38818a4a5390a39aa09deff5bf.tar.bz2
linux-0f0e8de334c54c38818a4a5390a39aa09deff5bf.zip
kbuild: set no-integrated-as before incl. arch Makefile
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> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e02d092bc2d6..9e7f69c26aba 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
@@ -743,8 +745,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.