Commit 337ff6bb authored Jan 11, 2023 by Nathan Chancellor Committed by Masahiro Yamada Jan 26, 2023

MIPS: Prefer cc-option for additions to cflags



A future change will switch as-option to use KBUILD_AFLAGS instead of
KBUILD_CFLAGS to allow clang to drop -Qunused-arguments, which may cause
issues if the flag being tested requires a flag previously added to
KBUILD_CFLAGS but not KBUILD_AFLAGS. Use cc-option for cflags additions
so that the flags are tested properly.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

parent 80a20d2f

arch/mips/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ cflags-y += -fno-stack-check
		#
		# Avoid this by explicitly disabling that assembler behaviour.
		#
		cflags-y += $(call as-option,-Wa$(comma)-mno-fix-loongson3-llsc,)
		cflags-y += $(call cc-option,-Wa$(comma)-mno-fix-loongson3-llsc,)

		#
		# CPU-dependent compiler/assembler options for optimization.

arch/mips/loongson2ef/Platform

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ cflags-$(CONFIG_CPU_LOONGSON2F) += -march=loongson2f
		# binutils does not merge support for the flag then we can revisit & remove
		# this later - for now it ensures vendor toolchains don't cause problems.
		#
		cflags-$(CONFIG_CPU_LOONGSON2EF) += $(call as-option,-Wa$(comma)-mno-fix-loongson3-llsc,)
		cflags-$(CONFIG_CPU_LOONGSON2EF) += $(call cc-option,-Wa$(comma)-mno-fix-loongson3-llsc,)

		# Enable the workarounds for Loongson2f
		ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS