On Wed, Sep 7, 2022 at 1:59 PM Nick Desaulniers <ndesaulniers@xxxxxxxxxx> wrote: > > 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 is being 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. > > Cc: Arvind Sankar <nivedita@xxxxxxxxxxxx> > Cc: x86@xxxxxxxxxx > 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> 01 and 02, applied to linux-kbuild/fixes. Thanks. > --- > Changes v2 -> v3: > * Reword commit message as per Nathan. > * Pick up Nathan's RB/TB tags. > > Changes v1 -> v2: > * Split off of v1 [1/3]. > * Use cc-option to update CFLAGS, as per Masahiro. > * Add Masahiro's Suggested-by, Cc Arvind. > > arch/x86/boot/compressed/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile > index 35ce1a64068b..85934204d905 100644 > --- a/arch/x86/boot/compressed/Makefile > +++ b/arch/x86/boot/compressed/Makefile > @@ -49,7 +49,7 @@ KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) > 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 > -- > 2.37.2.789.g6183377224-goog > -- Best Regards Masahiro Yamada
