Skip to content

Commit 35bd1d6

Browse files
authored
Rollup merge of rust-lang#100622 - taiki-e:aarch64-atomic-128, r=Amanieu
Support 128-bit atomics on all aarch64 targets Some aarch64 targets currently set `max_atomic_width` to 64, but aarch64 always supports 128-bit atomics. r? `@Amanieu`
2 parents 1d23d3a + 5bb04f3 commit 35bd1d6

5 files changed

+5
-5
lines changed

compiler/rustc_target/src/spec/aarch64_pc_windows_gnullvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::windows_gnullvm_base::opts();
5-
base.max_atomic_width = Some(64);
5+
base.max_atomic_width = Some(128);
66
base.features = "+neon,+fp-armv8".into();
77
base.linker = Some("aarch64-w64-mingw32-clang".into());
88

compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::windows_msvc_base::opts();
5-
base.max_atomic_width = Some(64);
5+
base.max_atomic_width = Some(128);
66
base.features = "+neon,+fp-armv8".into();
77

88
Target {

compiler/rustc_target/src/spec/aarch64_unknown_uefi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::spec::{LinkerFlavor, Target};
77
pub fn target() -> Target {
88
let mut base = uefi_msvc_base::opts();
99

10-
base.max_atomic_width = Some(64);
10+
base.max_atomic_width = Some(128);
1111
base.add_pre_link_args(LinkerFlavor::Msvc, &["/machine:arm64"]);
1212

1313
Target {

compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::Target;
22

33
pub fn target() -> Target {
44
let mut base = super::windows_uwp_msvc_base::opts();
5-
base.max_atomic_width = Some(64);
5+
base.max_atomic_width = Some(128);
66

77
Target {
88
llvm_target: "aarch64-pc-windows-msvc".into(),

compiler/rustc_target/src/spec/arm64_32_apple_watchos.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn target() -> Target {
1010
arch: "aarch64".into(),
1111
options: TargetOptions {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
13-
max_atomic_width: Some(64),
13+
max_atomic_width: Some(128),
1414
forces_embed_bitcode: true,
1515
// These arguments are not actually invoked - they just have
1616
// to look right to pass App Store validation.

0 commit comments

Comments
 (0)