Skip to content

Commit 11b4ee9

Browse files
authored
Rollup merge of rust-lang#73086 - trevyn:apple-a7, r=nikic
Rename "cyclone" to "apple-a7" per changes in upstream LLVM It looks like they intended to keep "cyclone" as a legacy option, but removed it from the list of subtarget features. This created a flood of warnings when targeting aarch64-apple-ios, and probably also created incorrectly optimized artifacts. See: https://reviews.llvm.org/D70779 https://reviews.llvm.org/D70779#C1703593NL568 LLVM 10 merged into master at: rust-lang#67759
2 parents aff5c55 + 6f6620b commit 11b4ee9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/librustc_target/spec/aarch64_apple_ios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515
target_vendor: "apple".to_string(),
1616
linker_flavor: LinkerFlavor::Gcc,
1717
options: TargetOptions {
18-
features: "+neon,+fp-armv8,+cyclone".to_string(),
18+
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1919
eliminate_frame_pointer: false,
2020
max_atomic_width: Some(128),
2121
abi_blacklist: super::arm_base::abi_blacklist(),

src/librustc_target/spec/aarch64_apple_tvos.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515
target_vendor: "apple".to_string(),
1616
linker_flavor: LinkerFlavor::Gcc,
1717
options: TargetOptions {
18-
features: "+neon,+fp-armv8,+cyclone".to_string(),
18+
features: "+neon,+fp-armv8,+apple-a7".to_string(),
1919
eliminate_frame_pointer: false,
2020
max_atomic_width: Some(128),
2121
abi_blacklist: super::arm_base::abi_blacklist(),

src/librustc_target/spec/apple_sdk_base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fn target_cpu(arch: Arch) -> String {
122122
match arch {
123123
Armv7 => "cortex-a8", // iOS7 is supported on iPhone 4 and higher
124124
Armv7s => "cortex-a9",
125-
Arm64 => "cyclone",
125+
Arm64 => "apple-a7",
126126
I386 => "yonah",
127127
X86_64 => "core2",
128128
X86_64_macabi => "core2",

0 commit comments

Comments
 (0)