projects / rustc.git / blame
| Commit | Line | Data |
|---|---|---|
| 94222f64 | 1 | From 6a4e6f5dc8c8a529a822eb9b57f9e57519595439 Mon Sep 17 00:00:00 2001 |
| 6a06907d XL |
2 | From: bjorn3 <bjorn3@users.noreply.github.com> |
| 3 | Date: Thu, 18 Feb 2021 18:45:28 +0100 | |
| 4 | Subject: [PATCH] Disable 128bit atomic operations | |
| 5 | ||
| 6 | Cranelift doesn't support them yet | |
| 7 | --- | |
| 94222f64 XL |
8 | library/core/src/panic/unwind_safe.rs | 6 ----- |
| 9 | library/core/src/sync/atomic.rs | 38 --------------------------- | |
| 10 | library/core/tests/atomic.rs | 4 --- | |
| 6a06907d XL |
11 | 3 files changed, 48 deletions(-) |
| 12 | ||
| 94222f64 XL |
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")] | |
| 6a06907d | 37 | diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs |
| 94222f64 | 38 | index 0194c58..25a0038 100644 |
| 6a06907d XL |
39 | --- a/library/core/src/sync/atomic.rs |
| 40 | +++ b/library/core/src/sync/atomic.rs | |
| 94222f64 | 41 | @@ -2229,44 +2229,6 @@ atomic_int! { |
| 6a06907d XL |
42 | "AtomicU64::new(0)", |
| 43 | u64 AtomicU64 ATOMIC_U64_INIT | |
| 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 = "32976"), | |
| 50 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 51 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 52 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 53 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 54 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 55 | - rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), | |
| 56 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 57 | - "i128", | |
| 58 | - "#![feature(integer_atomics)]\n\n", | |
| 59 | - atomic_min, atomic_max, | |
| 60 | - 16, | |
| 61 | - "AtomicI128::new(0)", | |
| 62 | - i128 AtomicI128 ATOMIC_I128_INIT | |
| 63 | -} | |
| 64 | -#[cfg(target_has_atomic_load_store = "128")] | |
| 65 | -atomic_int! { | |
| 66 | - cfg(target_has_atomic = "128"), | |
| 67 | - cfg(target_has_atomic_equal_alignment = "128"), | |
| 68 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 69 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 70 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 71 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 72 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 73 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 74 | - rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), | |
| 75 | - unstable(feature = "integer_atomics", issue = "32976"), | |
| 76 | - "u128", | |
| 77 | - "#![feature(integer_atomics)]\n\n", | |
| 78 | - atomic_umin, atomic_umax, | |
| 79 | - 16, | |
| 80 | - "AtomicU128::new(0)", | |
| 81 | - u128 AtomicU128 ATOMIC_U128_INIT | |
| 82 | -} | |
| 83 | ||
| 84 | macro_rules! atomic_int_ptr_sized { | |
| 85 | ( $($target_pointer_width:literal $align:literal)* ) => { $( | |
| 86 | diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs | |
| 94222f64 | 87 | index b735957..ea728b6 100644 |
| 6a06907d XL |
88 | --- a/library/core/tests/atomic.rs |
| 89 | +++ b/library/core/tests/atomic.rs | |
| 94222f64 | 90 | @@ -185,10 +185,6 @@ fn atomic_alignment() { |
| 6a06907d XL |
91 | assert_eq!(align_of::<AtomicU64>(), size_of::<AtomicU64>()); |
| 92 | #[cfg(target_has_atomic = "64")] | |
| 93 | assert_eq!(align_of::<AtomicI64>(), size_of::<AtomicI64>()); | |
| 94 | - #[cfg(target_has_atomic = "128")] | |
| 95 | - assert_eq!(align_of::<AtomicU128>(), size_of::<AtomicU128>()); | |
| 96 | - #[cfg(target_has_atomic = "128")] | |
| 97 | - assert_eq!(align_of::<AtomicI128>(), size_of::<AtomicI128>()); | |
| 98 | #[cfg(target_has_atomic = "ptr")] | |
| 99 | assert_eq!(align_of::<AtomicUsize>(), size_of::<AtomicUsize>()); | |
| 100 | #[cfg(target_has_atomic = "ptr")] | |
| 6a06907d XL |
101 | -- |
| 102 | 2.26.2.7.g19db9cfb68 | |
| 103 |