Skip to content

Commit 73d4a4a

Browse files
committed
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>
1 parent 000ea48 commit 73d4a4a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/um/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ config UML
2424
select TRACE_IRQFLAGS_SUPPORT
2525
select TTY # Needed for line.c
2626
select HAVE_ARCH_VMAP_STACK
27+
select HAVE_RUST if X86_64
2728

2829
config MMU
2930
bool

scripts/generate_rust_target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ fn main() {
198198
features += ",+c";
199199
}
200200
ts.push("features", features);
201-
} else if cfg.has("X86") {
201+
} else if cfg.has("X86_64") {
202202
ts.push("arch", "x86_64");
203203
ts.push(
204204
"data-layout",

0 commit comments

Comments
 (0)