1
- From 894e07dfec2624ba539129b1c1d63e1d7d812bda Mon Sep 17 00:00:00 2001
1
+ From 6a4e6f5dc8c8a529a822eb9b57f9e57519595439 Mon Sep 17 00:00:00 2001
2
2
3
3
Date: Thu, 18 Feb 2021 18:45:28 +0100
4
4
Subject: [PATCH] Disable 128bit atomic operations
5
5
6
6
Cranelift doesn't support them yet
7
7
---
8
- library/core/src/sync/atomic .rs | 38 ---------------------------- -----
9
- library/core/tests/ atomic.rs | 4 ----
10
- library/std/src/panic .rs | 6 --- ---
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
11
3 files changed, 48 deletions(-)
12
12
13
+ diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
14
+ index 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 = "32976")]
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 = "32976")]
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")]
13
37
diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
14
- index 81c9e1d..65c9503 100644
38
+ index 0194c58..25a0038 100644
15
39
--- a/library/core/src/sync/atomic.rs
16
40
+++ b/library/core/src/sync/atomic.rs
17
- @@ -2228 ,44 +2228 ,6 @@ atomic_int! {
41
+ @@ -2229 ,44 +2229 ,6 @@ atomic_int! {
18
42
"AtomicU64::new(0)",
19
43
u64 AtomicU64 ATOMIC_U64_INIT
20
44
}
@@ -60,10 +84,10 @@ index 81c9e1d..65c9503 100644
60
84
macro_rules! atomic_int_ptr_sized {
61
85
( $($target_pointer_width:literal $align:literal)* ) => { $(
62
86
diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs
63
- index 2d1e449..cb6da5d 100644
87
+ index b735957..ea728b6 100644
64
88
--- a/library/core/tests/atomic.rs
65
89
+++ b/library/core/tests/atomic.rs
66
- @@ -145 ,10 +145 ,6 @@ fn atomic_alignment() {
90
+ @@ -185 ,10 +185 ,6 @@ fn atomic_alignment() {
67
91
assert_eq!(align_of::<AtomicU64>(), size_of::<AtomicU64>());
68
92
#[cfg(target_has_atomic = "64")]
69
93
assert_eq!(align_of::<AtomicI64>(), size_of::<AtomicI64>());
@@ -74,30 +98,6 @@ index 2d1e449..cb6da5d 100644
74
98
#[cfg(target_has_atomic = "ptr")]
75
99
assert_eq!(align_of::<AtomicUsize>(), size_of::<AtomicUsize>());
76
100
#[cfg(target_has_atomic = "ptr")]
77
- diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
78
- index 89a822a..779fd88 100644
79
- --- a/library/std/src/panic.rs
80
- +++ b/library/std/src/panic.rs
81
- @@ -279,9 +279,6 @@ impl RefUnwindSafe for atomic::AtomicI32 {}
82
- #[cfg(target_has_atomic_load_store = "64")]
83
- #[stable(feature = "integer_atomics_stable", since = "1.34.0")]
84
- impl RefUnwindSafe for atomic::AtomicI64 {}
85
- - #[cfg(target_has_atomic_load_store = "128")]
86
- - #[unstable(feature = "integer_atomics", issue = "32976")]
87
- - impl RefUnwindSafe for atomic::AtomicI128 {}
88
-
89
- #[cfg(target_has_atomic_load_store = "ptr")]
90
- #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
91
- @@ -298,9 +295,6 @@ impl RefUnwindSafe for atomic::AtomicU32 {}
92
- #[cfg(target_has_atomic_load_store = "64")]
93
- #[stable(feature = "integer_atomics_stable", since = "1.34.0")]
94
- impl RefUnwindSafe for atomic::AtomicU64 {}
95
- - #[cfg(target_has_atomic_load_store = "128")]
96
- - #[unstable(feature = "integer_atomics", issue = "32976")]
97
- - impl RefUnwindSafe for atomic::AtomicU128 {}
98
-
99
- #[cfg(target_has_atomic_load_store = "8")]
100
- #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
101
101
- -
102
102
2.26.2.7.g19db9cfb68
103
103
0 commit comments