Rustup to rustc 1.33.0-nightly (c76f3c374 2019-01-18)
This commit is contained in:
parent
4dcb5f4399
commit
c728530bd0
30
patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch
Normal file
30
patches/0003-Disable-inline-assembly-in-hint-spin_loop.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 50ce3e454d5721cb534a9e9bb73c82246b930bab Mon Sep 17 00:00:00 2001
|
||||
From: bjorn3 <bjorn3@users.noreply.github.com>
|
||||
Date: Sat, 19 Jan 2019 11:46:43 +0100
|
||||
Subject: [PATCH] Disable inline assembly in hint::spin_loop
|
||||
|
||||
---
|
||||
src/libcore/hint.rs | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/libcore/hint.rs b/src/libcore/hint.rs
|
||||
index ad5a207..04712b8 100644
|
||||
--- a/src/libcore/hint.rs
|
||||
+++ b/src/libcore/hint.rs
|
||||
@@ -62,6 +62,7 @@ pub unsafe fn unreachable_unchecked() -> ! {
|
||||
#[inline]
|
||||
#[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");
|
||||
@@ -71,4 +72,5 @@ pub fn spin_loop() {
|
||||
unsafe {
|
||||
asm!("yield" ::: "memory" : "volatile");
|
||||
}
|
||||
+ */
|
||||
}
|
||||
--
|
||||
2.17.2 (Apple Git-113)
|
||||
|
@ -1,32 +0,0 @@
|
||||
From 6a5c292f9f9e28de4319f52b05744ed7d8863f76 Mon Sep 17 00:00:00 2001
|
||||
From: bjorn3 <bjorn3@users.noreply.github.com>
|
||||
Date: Sat, 6 Oct 2018 10:22:16 +0200
|
||||
Subject: [PATCH] Disable inline assembly in spin_loop_hint
|
||||
|
||||
---
|
||||
src/libcore/sync/atomic.rs | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
|
||||
index f130dbf..31db7a2 100644
|
||||
--- a/src/libcore/sync/atomic.rs
|
||||
+++ b/src/libcore/sync/atomic.rs
|
||||
@@ -106,6 +106,7 @@ use fmt;
|
||||
#[inline]
|
||||
#[stable(feature = "spin_loop_hint", since = "1.24.0")]
|
||||
pub fn spin_loop_hint() {
|
||||
+ /*
|
||||
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
|
||||
unsafe {
|
||||
asm!("pause" ::: "memory" : "volatile");
|
||||
@@ -115,6 +116,7 @@ pub fn spin_loop_hint() {
|
||||
unsafe {
|
||||
asm!("yield" ::: "memory" : "volatile");
|
||||
}
|
||||
+ */
|
||||
}
|
||||
|
||||
/// A boolean type which can be safely shared between threads.
|
||||
--
|
||||
2.17.1 (Apple Git-112)
|
||||
|
Loading…
x
Reference in New Issue
Block a user