From f1432c0e2d9d6c96c380c8e9cef89fcfd1b22d5b Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Mon, 25 Mar 2019 19:54:44 +0100 Subject: [PATCH] Rustup to rustc 1.35.0-nightly (0576ac109 2019-03-24) --- ...003-Disable-inline-assembly-in-hint-spin_loop.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch b/patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch index 700c48e4935..a96ac09f971 100644 --- a/patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch +++ b/patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch @@ -16,12 +16,12 @@ index ad5a207..04712b8 100644 #[unstable(feature = "renamed_spin_loop", issue = "55002")] pub fn spin_loop() { + /* - #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] - unsafe { - asm!("pause" ::: "memory" : "volatile"); + #[cfg( + all( + any(target_arch = "x86", target_arch = "x86_64"), @@ -71,4 +72,5 @@ pub fn spin_loop() { - unsafe { - asm!("yield" ::: "memory" : "volatile"); + unsafe { crate::arch::arm::__yield() }; + } } + */ }