rust: arch/um: Add support for CONFIG_RUST under x86_64 UML

CONFIG_RUST currently supports x86_64, but does not support it under UML. Adding support is trivial: - Add CONFIG_HAVE_RUST to UML if X86_64 is set. - Have generate_rust_target check for CONFIG_X86_64, which is present under UML, rather than CONFIG_X86, which isn't. Signed-off-by: David Gow <davidgow@google.com>
Rust-for-Linux · May 10, 2022 · 73d4a4a · 73d4a4a
1 parent 000ea48
commit 73d4a4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
@@ -24,6 +24,7 @@ config UML
 	select TRACE_IRQFLAGS_SUPPORT
 	select TTY # Needed for line.c
 	select HAVE_ARCH_VMAP_STACK
+	select HAVE_RUST			if X86_64
 
 config MMU
 	bool

diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs
@@ -198,7 +198,7 @@ fn main() {
             features += ",+c";
         }
         ts.push("features", features);
-    } else if cfg.has("X86") {
+    } else if cfg.has("X86_64") {
         ts.push("arch", "x86_64");
         ts.push(
             "data-layout",