Merge pull request #20339 from chrysn-pull-requests/native64-rust

cpu/native: Enable Rust on 64bit
RIOT-OS · Feb 23, 2024 · 6714a77 · 6714a77
2 parents 2600a1e + 7587c77
commit 6714a77
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/boards/native64/doc.txt b/boards/native64/doc.txt
@@ -6,7 +6,7 @@
 [Family: native](https://github.com/RIOT-OS/RIOT/wiki/Family:-native)
 
 Same board as \ref boards_native "native", but compiled for 64-bit instead of 32-bit.
-Currently only Linux x86-64 is supported, and Rust support is missing.
+Currently only Linux x86-64 is supported.
 Otherwise, everything works the same as for the 32-bit version.
 For more information on this board, see the \ref boards_native "native board" documentation.
 

diff --git a/cpu/native/Kconfig b/cpu/native/Kconfig
@@ -60,7 +60,7 @@ config NATIVE_OS_LINUX
     select HAS_PERIPH_GPIO
     select HAS_PERIPH_GPIO_IRQ
     select HAS_PERIPH_SPI
-    select HAS_RUST_TARGET if "$(OS_ARCH)" = "x86_64" && HAS_ARCH_32BIT
+    select HAS_RUST_TARGET if "$(OS_ARCH)" = "x86_64"
 
 config NATIVE_OS_FREEBSD
     bool

diff --git a/cpu/native/Makefile.features b/cpu/native/Makefile.features
@@ -19,10 +19,7 @@ FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_timer_periodic
 FEATURES_PROVIDED += periph_timer_query_freqs
 ifeq ($(OS) $(OS_ARCH),Linux x86_64)
-  # TODO: Add rust support for native 64 bit.
-  ifneq ($(BOARD),native64)
-    FEATURES_PROVIDED += rust_target
-  endif
+  FEATURES_PROVIDED += rust_target
 endif
 FEATURES_PROVIDED += ssp
 

diff --git a/examples/rust-gcoap/Cargo.lock b/examples/rust-gcoap/Cargo.lock
diff --git a/examples/rust-hello-world/Cargo.lock b/examples/rust-hello-world/Cargo.lock
diff --git a/sys/rust_riotmodules_standalone/Cargo.lock b/sys/rust_riotmodules_standalone/Cargo.lock
diff --git a/tests/rust_minimal/Cargo.lock b/tests/rust_minimal/Cargo.lock