Skip to content

Commit c728530

Browse files
committed
Rustup to rustc 1.33.0-nightly (c76f3c374 2019-01-18)
1 parent 4dcb5f4 commit c728530

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 50ce3e454d5721cb534a9e9bb73c82246b930bab Mon Sep 17 00:00:00 2001
2+
From: bjorn3 <bjorn3@users.noreply.github.com>
3+
Date: Sat, 19 Jan 2019 11:46:43 +0100
4+
Subject: [PATCH] Disable inline assembly in hint::spin_loop
5+
6+
---
7+
src/libcore/hint.rs | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
diff --git a/src/libcore/hint.rs b/src/libcore/hint.rs
11+
index ad5a207..04712b8 100644
12+
--- a/src/libcore/hint.rs
13+
+++ b/src/libcore/hint.rs
14+
@@ -62,6 +62,7 @@ pub unsafe fn unreachable_unchecked() -> ! {
15+
#[inline]
16+
#[unstable(feature = "renamed_spin_loop", issue = "55002")]
17+
pub fn spin_loop() {
18+
+ /*
19+
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
20+
unsafe {
21+
asm!("pause" ::: "memory" : "volatile");
22+
@@ -71,4 +72,5 @@ pub fn spin_loop() {
23+
unsafe {
24+
asm!("yield" ::: "memory" : "volatile");
25+
}
26+
+ */
27+
}
28+
--
29+
2.17.2 (Apple Git-113)
30+

patches/0003-Disable-inline-assembly-in-spin_loop_hint.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)