about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2018-11-05 15:46:13 +0200
committerSimonas Kazlauskas <git@kazlauskas.me>2018-11-05 18:54:17 +0200
commit99f7dc451fb7287df18b721bb2df5ab9a71245f3 (patch)
tree7d02b07bf874ec1482473abab95184b195881cbf
parent5e50acf443ecaad3f711780a62475e13c21e34ef (diff)
downloadrust-99f7dc451fb7287df18b721bb2df5ab9a71245f3.tar.gz
rust-99f7dc451fb7287df18b721bb2df5ab9a71245f3.zip
Do not Atomic{I,U}128 in stage0
-rw-r--r--src/libcore/sync/atomic.rs4
-rw-r--r--src/libstd/panic.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 82b73a8c432..56d3b429fdb 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1938,7 +1938,7 @@ atomic_int! {
     8,
     u64 AtomicU64 ATOMIC_U64_INIT
 }
-#[cfg(target_has_atomic = "128")]
+#[cfg(all(not(stage0), target_has_atomic = "128"))]
 atomic_int! {
     unstable(feature = "integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
@@ -1952,7 +1952,7 @@ atomic_int! {
     16,
     i128 AtomicI128 ATOMIC_I128_INIT
 }
-#[cfg(target_has_atomic = "128")]
+#[cfg(all(not(stage0), target_has_atomic = "128"))]
 atomic_int! {
     unstable(feature = "integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index 137ba7d449a..4bc18a57e92 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -264,7 +264,7 @@ impl RefUnwindSafe for atomic::AtomicI32 {}
 #[cfg(target_has_atomic = "64")]
 #[unstable(feature = "integer_atomics", issue = "32976")]
 impl RefUnwindSafe for atomic::AtomicI64 {}
-#[cfg(target_has_atomic = "128")]
+#[cfg(all(not(stage0), target_has_atomic = "128"))]
 #[unstable(feature = "integer_atomics", issue = "32976")]
 impl RefUnwindSafe for atomic::AtomicI128 {}
 
@@ -283,7 +283,7 @@ impl RefUnwindSafe for atomic::AtomicU32 {}
 #[cfg(target_has_atomic = "64")]
 #[unstable(feature = "integer_atomics", issue = "32976")]
 impl RefUnwindSafe for atomic::AtomicU64 {}
-#[cfg(target_has_atomic = "128")]
+#[cfg(all(not(stage0), target_has_atomic = "128"))]
 #[unstable(feature = "integer_atomics", issue = "32976")]
 impl RefUnwindSafe for atomic::AtomicU128 {}