Skip to content

Commit

Permalink
Auto merge of #39591 - alexcrichton:revert-128, r=brson
Browse files Browse the repository at this point in the history
Revert "Add 128-bit atomics"

This reverts commit 9903975.

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!
  • Loading branch information
bors committed Feb 7, 2017
2 parents 324b175 + bfa2642 commit c49d102
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
18 changes: 0 additions & 18 deletions src/libcore/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
10 changes: 1 addition & 9 deletions src/test/run-make/atomic-lock-free/atomic_lock_free.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c49d102

Please sign in to comment.