Skip to content

Commit a3aac12

Browse files
committed
kbuild: clang: Support building UM with SUBARCH=i386
The UM builds distinguish i386 from x86_64 via SUBARCH, but we don't support building i386 directly with Clang. To make SUBARCH work for i386 UM, we need to explicitly test for it. This lets me run i386 KUnit tests with Clang: $ ./tools/testing/kunit/kunit.py run \ --make_options LLVM=1 \ --make_options SUBARCH=i386 ... Fixes: c7500c1 ("um: Allow builds with Clang") Reviewed-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Tested-by: David Gow <[email protected]> Signed-off-by: Kees Cook <[email protected]>
1 parent d73ef9e commit a3aac12

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

scripts/Makefile.clang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu
1212
CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu
1313
CLANG_TARGET_FLAGS_sparc := sparc64-linux-gnu
1414
CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu
15+
# This is only for i386 UM builds, which need the 32-bit target not -m32
16+
CLANG_TARGET_FLAGS_i386 := i386-linux-gnu
1517
CLANG_TARGET_FLAGS_um := $(CLANG_TARGET_FLAGS_$(SUBARCH))
1618
CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(SRCARCH))
1719

0 commit comments

Comments
 (0)