Migrate llvm_asm! to asm!

See rust-lang/rust#70173 (comment). This gets shipped starting with nightly 2022-01-17.
sirhcel · Jan 18, 2022 · 5c66284 · 5c66284
1 parent 5b9d7ad
commit 5c66284
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/cpu.rs b/src/cpu.rs
@@ -22,7 +22,7 @@ pub fn core() -> u32 {
     #[cfg(any(esp32, esp32s3))]
     #[allow(deprecated)]
     unsafe {
-        llvm_asm!("rsr.prid $0\nextui $0,$0,13,1" : "=r"(core) : : : "volatile");
+        asm!("rsr.prid $0\nextui $0,$0,13,1" : "=r"(core) : : : "volatile");
     }
 
     core

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(llvm_asm)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![feature(generic_associated_types)] // For mutex
 

diff --git a/src/ulp/sys/cpu.rs b/src/ulp/sys/cpu.rs
@@ -19,7 +19,7 @@ pub fn get_ccount() -> u32 {
 
     #[allow(deprecated)]
     unsafe {
-        llvm_asm!("rdcycle $0" : "=r"(ccount) : : : "volatile");
+        asm!("rdcycle $0" : "=r"(ccount) : : : "volatile");
     }
 
     ccount