diff options
| author | bors <bors@rust-lang.org> | 2017-02-07 00:22:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-07 00:22:19 +0000 |
| commit | c49d10207a7e105525fb3bd71c18fde6fc2f5aed (patch) | |
| tree | b90aefcec334aa899e6bc30ef3826fd89172b66d /src/libcore | |
| parent | 324b175174c19b8be4592df11e65e0c4b6fee9d3 (diff) | |
| parent | bfa264271c7c20ca71b7cbb5c918ff264294653c (diff) | |
| download | rust-c49d10207a7e105525fb3bd71c18fde6fc2f5aed.tar.gz rust-c49d10207a7e105525fb3bd71c18fde6fc2f5aed.zip | |
Auto merge of #39591 - alexcrichton:revert-128, r=brson
Revert "Add 128-bit atomics" This reverts commit 9903975003276cc42a1ed5f21eee292b7c62c331. Unfortunately 128-bit atomics have broken our nightly builds (#39590) and while we investigate I'm posting a temporary revert of the PR that added them. If we can figure out a solution though before this lands I'd be happy to close!
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/sync/atomic.rs | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index 58cd0af7ee3..743e3c41170 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -1318,24 +1318,6 @@ atomic_int! { unstable(feature = "integer_atomics", issue = "32976"), u64 AtomicU64 ATOMIC_U64_INIT } -#[cfg(not(stage0))] -#[cfg(target_has_atomic = "128")] -atomic_int! { - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - i128 AtomicI128 ATOMIC_I128_INIT -} -#[cfg(not(stage0))] -#[cfg(target_has_atomic = "128")] -atomic_int! { - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - unstable(feature = "i128", issue = "35118"), - u128 AtomicU128 ATOMIC_U128_INIT -} #[cfg(target_has_atomic = "ptr")] atomic_int!{ stable(feature = "rust1", since = "1.0.0"), |