fork/rust

git clone https://git.julia.blue/fork/rust

borsAuto merge of #103046 - JanBeh:PR_clarify_cmp_terminology, r=workingjubilee3bcad65fbf6

master
3.6 KiB87 linesraw
1From ad7ffe71baba46865f2e65266ab025920dfdc20b Mon Sep 17 00:00:00 2001
2From: bjorn3 <bjorn3@users.noreply.github.com>
3Date: Thu, 18 Feb 2021 18:45:28 +0100
4Subject: [PATCH] Disable 128bit atomic operations
5
6Cranelift doesn't support them yet
7---
8 library/core/src/panic/unwind_safe.rs |  6 -----
9 library/core/src/sync/atomic.rs       | 38 ---------------------------
10 library/core/tests/atomic.rs          |  4 ---
11 4 files changed, 4 insertions(+), 50 deletions(-)
12
13diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
14index 092b7cf..158cf71 100644
15--- a/library/core/src/panic/unwind_safe.rs
16+++ b/library/core/src/panic/unwind_safe.rs
17@@ -216,9 +216,6 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicI32 {}
18 #[cfg(target_has_atomic_load_store = "64")]
19 #[stable(feature = "integer_atomics_stable", since = "1.34.0")]
20 impl RefUnwindSafe for crate::sync::atomic::AtomicI64 {}
21-#[cfg(target_has_atomic_load_store = "128")]
22-#[unstable(feature = "integer_atomics", issue = "99069")]
23-impl RefUnwindSafe for crate::sync::atomic::AtomicI128 {}
24
25 #[cfg(target_has_atomic_load_store = "ptr")]
26 #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
27@@ -235,9 +232,6 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicU32 {}
28 #[cfg(target_has_atomic_load_store = "64")]
29 #[stable(feature = "integer_atomics_stable", since = "1.34.0")]
30 impl RefUnwindSafe for crate::sync::atomic::AtomicU64 {}
31-#[cfg(target_has_atomic_load_store = "128")]
32-#[unstable(feature = "integer_atomics", issue = "99069")]
33-impl RefUnwindSafe for crate::sync::atomic::AtomicU128 {}
34
35 #[cfg(target_has_atomic_load_store = "8")]
36 #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
37diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
38index d9de37e..8293fce 100644
39--- a/library/core/src/sync/atomic.rs
40+++ b/library/core/src/sync/atomic.rs
41@@ -2996,42 +2996,6 @@ atomic_int! {
42     8,
43     u64 AtomicU64
44 }
45-#[cfg(target_has_atomic_load_store = "128")]
46-atomic_int! {
47-    cfg(target_has_atomic = "128"),
48-    cfg(target_has_atomic_equal_alignment = "128"),
49-    unstable(feature = "integer_atomics", issue = "99069"),
50-    unstable(feature = "integer_atomics", issue = "99069"),
51-    unstable(feature = "integer_atomics", issue = "99069"),
52-    unstable(feature = "integer_atomics", issue = "99069"),
53-    unstable(feature = "integer_atomics", issue = "99069"),
54-    unstable(feature = "integer_atomics", issue = "99069"),
55-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
56-    cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
57-    "i128",
58-    "#![feature(integer_atomics)]\n\n",
59-    atomic_min, atomic_max,
60-    16,
61-    i128 AtomicI128
62-}
63-#[cfg(target_has_atomic_load_store = "128")]
64-atomic_int! {
65-    cfg(target_has_atomic = "128"),
66-    cfg(target_has_atomic_equal_alignment = "128"),
67-    unstable(feature = "integer_atomics", issue = "99069"),
68-    unstable(feature = "integer_atomics", issue = "99069"),
69-    unstable(feature = "integer_atomics", issue = "99069"),
70-    unstable(feature = "integer_atomics", issue = "99069"),
71-    unstable(feature = "integer_atomics", issue = "99069"),
72-    unstable(feature = "integer_atomics", issue = "99069"),
73-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
74-    cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
75-    "u128",
76-    "#![feature(integer_atomics)]\n\n",
77-    atomic_umin, atomic_umax,
78-    16,
79-    u128 AtomicU128
80-}
81 
82 #[cfg(target_has_atomic_load_store = "ptr")]
83 macro_rules! atomic_int_ptr_sized {
84     ( $($target_pointer_width:literal $align:literal)* ) => { $(
85--
862.26.2.7.g19db9cfb68
87