This is a note to let you know that I've just added the patch titled x86/boot/compressed: prefer cc-option for CFLAGS additions 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: x86-boot-compressed-prefer-cc-option-for-cflags-additions.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:41 2023 From: Nathan Chancellor <nathan@xxxxxxxxxx> Date: Wed, 14 Jun 2023 11:04:35 -0700 Subject: x86/boot/compressed: prefer cc-option for CFLAGS additions To: gregkh@xxxxxxxxxxxxxxxxxxx, sashal@xxxxxxxxxx, ndesaulniers@xxxxxxxxxx Cc: naresh.kamboju@xxxxxxxxxx, stable@xxxxxxxxxxxxxxx, llvm@xxxxxxxxxxxxxxx, Masahiro Yamada <masahiroy@xxxxxxxxxx>, Nathan Chancellor <nathan@xxxxxxxxxx>, Linux Kernel Functional Testing <lkft@xxxxxxxxxx>, Anders Roxell <anders.roxell@xxxxxxxxxx> Message-ID: <20230612-6-1-asssembler-target-llvm-17-v1-1-75605d553401@xxxxxxxxxx> From: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> commit 994f5f7816ff963f49269cfc97f63cb2e4edb84f upstream. as-option tests new options using KBUILD_CFLAGS, which causes problems when using as-option to update KBUILD_AFLAGS because many compiler options are not valid assembler options. This will be fixed in a follow up patch. Before doing so, move the assembler test for -Wa,-mrelax-relocations=no from using as-option to cc-option. Link: https://lore.kernel.org/llvm/CAK7LNATcHt7GcXZ=jMszyH=+M_LC9Qr6yeAGRCBbE6xriLxtUQ@xxxxxxxxxxxxxx/ Suggested-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Reviewed-by: Nathan Chancellor <nathan@xxxxxxxxxx> Tested-by: Nathan Chancellor <nathan@xxxxxxxxxx> Signed-off-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Signed-off-by: Nathan Chancellor <nathan@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/x86/boot/compressed/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -50,7 +50,7 @@ KBUILD_CFLAGS += $(call cc-option,-fmacr KBUILD_CFLAGS += -fno-asynchronous-unwind-tables KBUILD_CFLAGS += -D__DISABLE_EXPORTS # Disable relocation relaxation in case the link is not PIE. -KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no) +KBUILD_CFLAGS += $(call cc-option,-Wa$(comma)-mrelax-relocations=no) KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h # sev.c indirectly inludes inat-table.h which is generated during 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