Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 99f7dc4

Browse files
committedNov 5, 2018
Do not Atomic{I,U}128 in stage0
1 parent 5e50acf commit 99f7dc4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎src/libcore/sync/atomic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ atomic_int! {
19381938
8,
19391939
u64 AtomicU64 ATOMIC_U64_INIT
19401940
}
1941-
#[cfg(target_has_atomic = "128")]
1941+
#[cfg(all(not(stage0), target_has_atomic = "128"))]
19421942
atomic_int! {
19431943
unstable(feature = "integer_atomics", issue = "32976"),
19441944
unstable(feature = "integer_atomics", issue = "32976"),
@@ -1952,7 +1952,7 @@ atomic_int! {
19521952
16,
19531953
i128 AtomicI128 ATOMIC_I128_INIT
19541954
}
1955-
#[cfg(target_has_atomic = "128")]
1955+
#[cfg(all(not(stage0), target_has_atomic = "128"))]
19561956
atomic_int! {
19571957
unstable(feature = "integer_atomics", issue = "32976"),
19581958
unstable(feature = "integer_atomics", issue = "32976"),

‎src/libstd/panic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ impl RefUnwindSafe for atomic::AtomicI32 {}
264264
#[cfg(target_has_atomic = "64")]
265265
#[unstable(feature = "integer_atomics", issue = "32976")]
266266
impl RefUnwindSafe for atomic::AtomicI64 {}
267-
#[cfg(target_has_atomic = "128")]
267+
#[cfg(all(not(stage0), target_has_atomic = "128"))]
268268
#[unstable(feature = "integer_atomics", issue = "32976")]
269269
impl RefUnwindSafe for atomic::AtomicI128 {}
270270

@@ -283,7 +283,7 @@ impl RefUnwindSafe for atomic::AtomicU32 {}
283283
#[cfg(target_has_atomic = "64")]
284284
#[unstable(feature = "integer_atomics", issue = "32976")]
285285
impl RefUnwindSafe for atomic::AtomicU64 {}
286-
#[cfg(target_has_atomic = "128")]
286+
#[cfg(all(not(stage0), target_has_atomic = "128"))]
287287
#[unstable(feature = "integer_atomics", issue = "32976")]
288288
impl RefUnwindSafe for atomic::AtomicU128 {}
289289

0 commit comments

Comments
 (0)
Please sign in to comment.