mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
kbuild: set no-integrated-as before incl. arch Makefile
[ Upstream commit0f0e8de334
] 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:cfe17c9bbe
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a972222a6a
commit
6cfb67394a
1 changed files with 2 additions and 2 deletions
4
Makefile
4
Makefile
|
@ -487,6 +487,8 @@ CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
|
||||||
endif
|
endif
|
||||||
KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
|
KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
|
||||||
KBUILD_AFLAGS += $(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
|
endif
|
||||||
|
|
||||||
RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
|
RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
|
||||||
|
@ -721,8 +723,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
|
||||||
# See modpost pattern 2
|
# See modpost pattern 2
|
||||||
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
|
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
|
||||||
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
|
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
|
else
|
||||||
|
|
||||||
# These warnings generated too much noise in a regular build.
|
# These warnings generated too much noise in a regular build.
|
||||||
|
|
Loading…
Reference in a new issue