Skip to content

Commit b99b5e5

Browse files
committed
Enable stack probes on aarch64 for LLVM 18
1 parent 370c911 commit b99b5e5

32 files changed

+80
-35
lines changed

compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
use crate::spec::base::apple::{macos_llvm_target, opts, Arch};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64;
66
let mut base = opts("macos", arch);
77
base.cpu = "apple-m1".into();
88
base.max_atomic_width = Some(128);
9+
base.stack_probes = StackProbeType::Inline;
910

1011
// FIXME: The leak sanitizer currently fails the tests, see #88132.
1112
base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI | SanitizerSet::THREAD;

compiler/rustc_target/src/spec/targets/aarch64_apple_ios.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::spec::base::apple::{ios_llvm_target, opts, Arch};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64;
@@ -18,6 +18,7 @@ pub fn target() -> Target {
1818
options: TargetOptions {
1919
features: "+neon,+fp-armv8,+apple-a7".into(),
2020
max_atomic_width: Some(128),
21+
stack_probes: StackProbeType::Inline,
2122
frame_pointer: FramePointer::NonLeaf,
2223
..base
2324
},

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_macabi.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use crate::spec::base::apple::{opts, Arch};
2-
use crate::spec::{Cc, FramePointer, LinkerFlavor, Lld, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{
3+
Cc, FramePointer, LinkerFlavor, Lld, SanitizerSet, StackProbeType, Target, TargetOptions,
4+
};
35

46
pub fn target() -> Target {
57
let llvm_target = "arm64-apple-ios14.0-macabi";
@@ -17,6 +19,7 @@ pub fn target() -> Target {
1719
options: TargetOptions {
1820
features: "+neon,+fp-armv8,+apple-a12".into(),
1921
max_atomic_width: Some(128),
22+
stack_probes: StackProbeType::Inline,
2023
frame_pointer: FramePointer::NonLeaf,
2124
..base
2225
},

compiler/rustc_target/src/spec/targets/aarch64_apple_ios_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::spec::base::apple::{ios_sim_llvm_target, opts, Arch};
2-
use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
2+
use crate::spec::{FramePointer, SanitizerSet, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64_sim;
@@ -18,6 +18,7 @@ pub fn target() -> Target {
1818
options: TargetOptions {
1919
features: "+neon,+fp-armv8,+apple-a7".into(),
2020
max_atomic_width: Some(128),
21+
stack_probes: StackProbeType::Inline,
2122
frame_pointer: FramePointer::NonLeaf,
2223
..base
2324
},

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::spec::base::apple::{opts, tvos_llvm_target, Arch};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64;
@@ -11,6 +11,7 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
14+
stack_probes: StackProbeType::Inline,
1415
frame_pointer: FramePointer::NonLeaf,
1516
..opts("tvos", arch)
1617
},

compiler/rustc_target/src/spec/targets/aarch64_apple_tvos_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::spec::base::apple::{opts, tvos_sim_llvm_target, Arch};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64_sim;
@@ -11,6 +11,7 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
14+
stack_probes: StackProbeType::Inline,
1415
frame_pointer: FramePointer::NonLeaf,
1516
..opts("tvos", arch)
1617
},

compiler/rustc_target/src/spec/targets/aarch64_apple_watchos_sim.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::spec::base::apple::{opts, watchos_sim_llvm_target, Arch};
2-
use crate::spec::{FramePointer, Target, TargetOptions};
2+
use crate::spec::{FramePointer, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let arch = Arch::Arm64_sim;
@@ -15,6 +15,7 @@ pub fn target() -> Target {
1515
options: TargetOptions {
1616
features: "+neon,+fp-armv8,+apple-a7".into(),
1717
max_atomic_width: Some(128),
18+
stack_probes: StackProbeType::Inline,
1819
frame_pointer: FramePointer::NonLeaf,
1920
..opts("watchos", arch)
2021
},

compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::abi::Endian;
2-
use crate::spec::{base, Target, TargetOptions};
2+
use crate::spec::{base, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
Target {
@@ -10,6 +10,7 @@ pub fn target() -> Target {
1010
options: TargetOptions {
1111
features: "+v8a,+outline-atomics".into(),
1212
max_atomic_width: Some(128),
13+
stack_probes: StackProbeType::Inline,
1314
mcount: "\u{1}_mcount".into(),
1415
endian: Endian::Big,
1516
..base::linux_gnu::opts()

compiler/rustc_target/src/spec/targets/aarch64_be_unknown_linux_gnu_ilp32.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::abi::Endian;
2-
use crate::spec::{base, Target, TargetOptions};
2+
use crate::spec::{base, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let mut base = base::linux_gnu::opts();
@@ -13,6 +13,7 @@ pub fn target() -> Target {
1313
options: TargetOptions {
1414
abi: "ilp32".into(),
1515
features: "+v8a,+outline-atomics".into(),
16+
stack_probes: StackProbeType::Inline,
1617
mcount: "\u{1}_mcount".into(),
1718
endian: Endian::Big,
1819
..base

compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::abi::Endian;
2-
use crate::spec::{base, Target, TargetOptions};
2+
use crate::spec::{base, StackProbeType, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
Target {
@@ -10,6 +10,7 @@ pub fn target() -> Target {
1010
options: TargetOptions {
1111
mcount: "__mcount".into(),
1212
max_atomic_width: Some(128),
13+
stack_probes: StackProbeType::Inline,
1314
endian: Endian::Big,
1415
..base::netbsd::opts()
1516
},

0 commit comments

Comments
 (0)