Skip to content

Commit c49d102

Browse files
committed
Auto merge of #39591 - alexcrichton:revert-128, r=brson
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!
2 parents 324b175 + bfa2642 commit c49d102

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

src/libcore/sync/atomic.rs

-18
Original file line numberDiff line numberDiff line change
@@ -1318,24 +1318,6 @@ atomic_int! {
13181318
unstable(feature = "integer_atomics", issue = "32976"),
13191319
u64 AtomicU64 ATOMIC_U64_INIT
13201320
}
1321-
#[cfg(not(stage0))]
1322-
#[cfg(target_has_atomic = "128")]
1323-
atomic_int! {
1324-
unstable(feature = "i128", issue = "35118"),
1325-
unstable(feature = "i128", issue = "35118"),
1326-
unstable(feature = "i128", issue = "35118"),
1327-
unstable(feature = "i128", issue = "35118"),
1328-
i128 AtomicI128 ATOMIC_I128_INIT
1329-
}
1330-
#[cfg(not(stage0))]
1331-
#[cfg(target_has_atomic = "128")]
1332-
atomic_int! {
1333-
unstable(feature = "i128", issue = "35118"),
1334-
unstable(feature = "i128", issue = "35118"),
1335-
unstable(feature = "i128", issue = "35118"),
1336-
unstable(feature = "i128", issue = "35118"),
1337-
u128 AtomicU128 ATOMIC_U128_INIT
1338-
}
13391321
#[cfg(target_has_atomic = "ptr")]
13401322
atomic_int!{
13411323
stable(feature = "rust1", since = "1.0.0"),

src/test/run-make/atomic-lock-free/atomic_lock_free.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(cfg_target_has_atomic, no_core, intrinsics, lang_items, i128_type)]
11+
#![feature(cfg_target_has_atomic, no_core, intrinsics, lang_items)]
1212
#![crate_type="rlib"]
1313
#![no_core]
1414

@@ -54,14 +54,6 @@ pub unsafe fn atomic_u64(x: *mut u64) {
5454
pub unsafe fn atomic_i64(x: *mut i64) {
5555
atomic_xadd(x, 1);
5656
}
57-
#[cfg(target_has_atomic = "128")]
58-
pub unsafe fn atomic_u128(x: *mut u128) {
59-
atomic_xadd(x, 1);
60-
}
61-
#[cfg(target_has_atomic = "128")]
62-
pub unsafe fn atomic_i128(x: *mut i128) {
63-
atomic_xadd(x, 1);
64-
}
6557
#[cfg(target_has_atomic = "ptr")]
6658
pub unsafe fn atomic_usize(x: *mut usize) {
6759
atomic_xadd(x, 1);

0 commit comments

Comments
 (0)