fix(executor): add a prefix to the FFI fn to avoid symbol collisions

chrysn-pull-requests · Nov 29, 2024 · 5728129 · 5728129
1 parent 56cac7e
commit 5728129
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ariel-os-embassy/src/lib.rs b/src/ariel-os-embassy/src/lib.rs
@@ -127,7 +127,7 @@ pub(crate) fn init() {
 }
 
 #[cfg(feature = "executor-single-thread")]
-#[export_name = "ariel_os_embassy_init"]
+#[export_name = "__ariel_os_embassy_init"]
 fn init() -> ! {
     debug!("ariel-os-embassy::init(): using single thread executor");
     let p = hal::init();

diff --git a/src/ariel-os-rt/src/lib.rs b/src/ariel-os-rt/src/lib.rs
@@ -88,10 +88,10 @@ fn startup() -> ! {
     #[cfg(feature = "executor-single-thread")]
     {
         extern "Rust" {
-            fn ariel_os_embassy_init() -> !;
+            fn __ariel_os_embassy_init() -> !;
         }
         debug!("ariel_os_rt::startup() launching single thread executor");
-        unsafe { ariel_os_embassy_init() };
+        unsafe { __ariel_os_embassy_init() };
     }
 
     #[cfg(not(any(feature = "threading", feature = "executor-single-thread")))]