From bfa264271c7c20ca71b7cbb5c918ff264294653c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 6 Feb 2017 10:39:14 -0800 Subject: [PATCH] Revert "Add 128-bit atomics" This reverts commit 9903975003276cc42a1ed5f21eee292b7c62c331. --- src/libcore/sync/atomic.rs | 18 ------------------ .../atomic-lock-free/atomic_lock_free.rs | 10 +--------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index 58cd0af7ee387..743e3c41170a3 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"), diff --git a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs b/src/test/run-make/atomic-lock-free/atomic_lock_free.rs index 5ac50e04b8d2f..023f2218b87ae 100644 --- a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs +++ b/src/test/run-make/atomic-lock-free/atomic_lock_free.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(cfg_target_has_atomic, no_core, intrinsics, lang_items, i128_type)] +#![feature(cfg_target_has_atomic, no_core, intrinsics, lang_items)] #![crate_type="rlib"] #![no_core] @@ -54,14 +54,6 @@ pub unsafe fn atomic_u64(x: *mut u64) { pub unsafe fn atomic_i64(x: *mut i64) { atomic_xadd(x, 1); } -#[cfg(target_has_atomic = "128")] -pub unsafe fn atomic_u128(x: *mut u128) { - atomic_xadd(x, 1); -} -#[cfg(target_has_atomic = "128")] -pub unsafe fn atomic_i128(x: *mut i128) { - atomic_xadd(x, 1); -} #[cfg(target_has_atomic = "ptr")] pub unsafe fn atomic_usize(x: *mut usize) { atomic_xadd(x, 1);