Skip to content

Commit f1432c0

Browse files
committed
Rustup to rustc 1.35.0-nightly (0576ac109 2019-03-24)
1 parent a715c79 commit f1432c0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ index ad5a207..04712b8 100644
1616
#[unstable(feature = "renamed_spin_loop", issue = "55002")]
1717
pub fn spin_loop() {
1818
+ /*
19-
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
20-
unsafe {
21-
asm!("pause" ::: "memory" : "volatile");
19+
#[cfg(
20+
all(
21+
any(target_arch = "x86", target_arch = "x86_64"),
2222
@@ -71,4 +72,5 @@ pub fn spin_loop() {
23-
unsafe {
24-
asm!("yield" ::: "memory" : "volatile");
23+
unsafe { crate::arch::arm::__yield() };
24+
}
2525
}
2626
+ */
2727
}

0 commit comments

Comments
 (0)