Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 4685d6f

Browse files
bors[bot]eldruin
andauthored
Merge #55
55: Use llvm_asm! for assembly since asm! is deprecated r=jonas-schievink a=eldruin This fixes the build with the `inline-asm` feature on nightly. Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
2 parents 4e77e2f + 8ea07de commit 4685d6f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
//!
158158
//! ## `inline-asm`
159159
//!
160-
//! When this feature is enabled semihosting is implemented using inline assembly (`asm!`) and
160+
//! When this feature is enabled semihosting is implemented using inline assembly (`llvm_asm!`) and
161161
//! compiling this crate requires nightly.
162162
//!
163163
//! When this feature is disabled semihosting is implemented using FFI calls into an external
@@ -179,7 +179,7 @@
179179
//!
180180
//! [pdf]: http://infocenter.arm.com/help/topic/com.arm.doc.dui0471e/DUI0471E_developing_for_arm_processors.pdf
181181
182-
#![cfg_attr(feature = "inline-asm", feature(asm))]
182+
#![cfg_attr(feature = "inline-asm", feature(llvm_asm))]
183183
#![deny(missing_docs)]
184184
#![deny(warnings)]
185185
#![no_std]
@@ -214,7 +214,7 @@ pub unsafe fn syscall1(_nr: usize, _arg: usize) -> usize {
214214
#[cfg(all(thumb, feature = "inline-asm"))]
215215
() => {
216216
let mut nr = _nr;
217-
asm!("bkpt 0xAB" : "+{r0}"(nr) : "{r1}"(_arg) :: "volatile");
217+
llvm_asm!("bkpt 0xAB" : "+{r0}"(nr) : "{r1}"(_arg) :: "volatile");
218218
nr
219219
}
220220

0 commit comments

Comments
 (0)