Skip to content

Commit 5fe392f

Browse files
nathanchancesuryasaimadhu
authored andcommitted
x86/boot/compressed: Move CLANG_FLAGS to beginning of KBUILD_CFLAGS
When cross compiling i386_defconfig on an arm64 host with clang, there are a few instances of '-Waddress-of-packed-member' and '-Wgnu-variable-sized-type-not-at-end' in arch/x86/boot/compressed/, which should both be disabled with the cc-disable-warning calls in that directory's Makefile, which indicates that cc-disable-warning is failing at the point of testing these flags. The cc-disable-warning calls fail because at the point that the flags are tested, KBUILD_CFLAGS has '-march=i386' without $(CLANG_FLAGS), which has the '--target=' flag to tell clang what architecture it is targeting. Without the '--target=' flag, the host architecture (arm64) is used and i386 is not a valid value for '-march=' in that case. This error can be seen by adding some logging to try-run: clang-14: error: the clang compiler does not support '-march=i386' Invoking the compiler has to succeed prior to calling cc-option or cc-disable-warning in order to accurately test whether or not the flag is supported; if it doesn't, the requested flag can never be added to the compiler flags. Move $(CLANG_FLAGS) to the beginning of KBUILD_FLAGS so that any new flags that might be added in the future can be accurately tested. Fixes: d5cbd80 ("x86/boot: Add $(CLANG_FLAGS) to compressed KBUILD_CFLAGS") Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a7904a5 commit 5fe392f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

arch/x86/boot/compressed/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ KCOV_INSTRUMENT := n
2828
targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \
2929
vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst
3030

31-
KBUILD_CFLAGS := -m$(BITS) -O2
31+
# CLANG_FLAGS must come before any cc-disable-warning or cc-option calls in
32+
# case of cross compiling, as it has the '--target=' flag, which is needed to
33+
# avoid errors with '-march=i386', and future flags may depend on the target to
34+
# be valid.
35+
KBUILD_CFLAGS := -m$(BITS) -O2 $(CLANG_FLAGS)
3236
KBUILD_CFLAGS += -fno-strict-aliasing -fPIE
3337
KBUILD_CFLAGS += -Wundef
3438
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -47,7 +51,6 @@ KBUILD_CFLAGS += -D__DISABLE_EXPORTS
4751
# Disable relocation relaxation in case the link is not PIE.
4852
KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
4953
KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h
50-
KBUILD_CFLAGS += $(CLANG_FLAGS)
5154

5255
# sev.c indirectly inludes inat-table.h which is generated during
5356
# compilation and stored in $(objtree). Add the directory to the includes so

0 commit comments

Comments
 (0)