Skip to contentSkip to conversation

rust: arch:um: Fix building 32-bit UML with GCC

PATCH Applied David Gow 2 participants 2 messages Apr 25 – Apr 30

Subsystems (2)
lore
Share & tools
lore

David Gow

author
#0 lore raw

PATCH 1/1 rust: arch:um: Fix building 32-bit UML with GCC

32-bit UML builds can be configured either by setting CONFIG_64BIT=n or with SUBARCH=i386. Both work with Rust-for-Linux when clang is the compiler, but when SUBARCH=i386, we don't set a bindgen target correctly if gcc is the compiler.

Add the appropriate bindgen target configuration for i386, as is done in Makefile.clang.

Fixes ab0f4cedc355 ("arch: um: rust: Add i386 support for Rust")

---

This could go in via either the rust or um trees. I suspect rust is less likely to trigger conflicts, though.

Cheers,
-- David

---
 rust/Makefile | 2 ++
 1 file changed, 2 insertions(+)
rust/Makefile +2 -0
index b361bfedfdf0..b9e9f512cec3 100644
@@ -403,6 +403,8 @@ BINDGEN_TARGET_x86	:= x86_64-linux-gnu
 BINDGEN_TARGET_arm64	:= aarch64-linux-gnu
 BINDGEN_TARGET_arm	:= arm-linux-gnueabi
 BINDGEN_TARGET_loongarch	:= loongarch64-linux-gnusf
+# This is only for i386 UM builds, which need the 32-bit target not -m32
+BINDGEN_TARGET_i386	:= i386-linux-gnu
 BINDGEN_TARGET_um	:= $(BINDGEN_TARGET_$(SUBARCH))
 BINDGEN_TARGET		:= $(BINDGEN_TARGET_$(SRCARCH))
 
Signature · 1 line
2.53.0
Applied
#1 lore raw
Quoted 11 lines · David Gow

32-bit UML builds can be configured either by setting CONFIG_64BIT=n or with SUBARCH=i386. Both work with Rust-for-Linux when clang is the compiler, but when SUBARCH=i386, we don't set a bindgen target correctly if gcc is the compiler.

Add the appropriate bindgen target configuration for i386, as is done in Makefile.clang.

Fixes ab0f4cedc355 ("arch: um: rust: Add i386 support for Rust")

Applied to rust-fixes -- thanks!

[ For reference, the errors look like:

BINDGEN rust/bindings/bindings_generated.rs
error: unsupported option '-mno-sse' for target ''
...
error: unknown target triple 'unknown' panicked at .../bindgen-0.72.1/ir/context.rs:562:15:
libclang error; possible causes include:
...

- Miguel ]

[ Added space in title. - Miguel ]

(I left the comment as-is to keep the match from Makefile.clang).

Cheers,
Miguel