This is a note to let you know that I've just added the patch titled MIPS: Prefer cc-option for additions to cflags to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-prefer-cc-option-for-additions-to-cflags.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From nathan@xxxxxxxxxx Wed Jun 14 20:04:43 2023 From: Nathan Chancellor <nathan@xxxxxxxxxx> Date: Wed, 14 Jun 2023 11:04:37 -0700 Subject: MIPS: Prefer cc-option for additions to cflags To: gregkh@xxxxxxxxxxxxxxxxxxx, sashal@xxxxxxxxxx, ndesaulniers@xxxxxxxxxx Cc: naresh.kamboju@xxxxxxxxxx, stable@xxxxxxxxxxxxxxx, llvm@xxxxxxxxxxxxxxx, "Nathan Chancellor" <nathan@xxxxxxxxxx>, "Thomas Bogendoerfer" <tsbogend@xxxxxxxxxxxxxxxx>, "Philippe Mathieu-Daudé" <philmd@xxxxxxxxxx>, "Linux Kernel Functional Testing" <lkft@xxxxxxxxxx>, "Anders Roxell" <anders.roxell@xxxxxxxxxx>, "Masahiro Yamada" <masahiroy@xxxxxxxxxx> Message-ID: <20230612-6-1-asssembler-target-llvm-17-v1-3-75605d553401@xxxxxxxxxx> From: Nathan Chancellor <nathan@xxxxxxxxxx> commit 337ff6bb8960fdc128cabd264aaea3d42ca27a32 upstream. 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@xxxxxxxxxx> Acked-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx> Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> Tested-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx> Tested-by: Anders Roxell <anders.roxell@xxxxxxxxxx> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/mips/Makefile | 2 +- arch/mips/loongson2ef/Platform | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -152,7 +152,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. --- a/arch/mips/loongson2ef/Platform +++ b/arch/mips/loongson2ef/Platform @@ -25,7 +25,7 @@ cflags-$(CONFIG_CPU_LOONGSON2F) += -marc # 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 Patches currently in stable-queue which might be from nathan@xxxxxxxxxx are queue-6.1/riscv-purgatory-remove-pgo-flags.patch queue-6.1/powerpc-purgatory-remove-pgo-flags.patch queue-6.1/mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch queue-6.1/kexec-support-purgatories-with-.text.hot-sections.patch queue-6.1/mips-prefer-cc-option-for-additions-to-cflags.patch queue-6.1/x86-purgatory-remove-pgo-flags.patch queue-6.1/x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch queue-6.1/kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch