Skip to content

Commit b9b107f

Browse files
sulixfbq
authored andcommitted
arch: um: rust: Use the generated target.json again
The Rust compiler can take a target config from 'target.json', which is generated by scripts/generate_rust_target.rs. It used to be that all Linux architectures used this to generate a target.json, but now architectures must opt-in to this, or they will default to the Rust compiler's built-in target definition. This is mostly okay for (64-bit) x86 and UML, except that it can generate SSE instructions, which we can't use in the kernel. So re-instate the custom target.json, which disables SSE (and generally enables the 'soft-float' feature). This fixes the following compile error: error: <unknown>:0:0: in function _RNvMNtCs5QSdWC790r4_4core3f32f7next_up float (float): SSE register return with SSE disabled Fixes: f82811e ("rust: Refactor the build target to allow the use of builtin targets") Signed-off-by: David Gow <[email protected]> Reviewed-by: Boqun Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b0dec01 commit b9b107f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/Makefile.um

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ core-y += arch/x86/crypto/
99
#
1010
ifeq ($(CONFIG_CC_IS_CLANG),y)
1111
KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
12+
KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
1213
KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
1314
endif
1415

0 commit comments

Comments
 (0)