mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix x86_64-apple-ios target to use the correct target_abi

Browse Source
This commit is contained in:
BlackHoleFox 2022-10-23 15:23:04 -05:00
parent 1ca6777c01
commit 79eedef984
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_target/src/spec/apple/tests.rs Normal file
View File

@ -0,0 +1,15 @@
use crate::spec::{aarch64_apple_ios_sim, aarch64_apple_watchos_sim, x86_64_apple_ios};
#[test]
fn simulator_targets_set_abi() {
let all_sim_targets = [
x86_64_apple_ios::target(),
aarch64_apple_ios_sim::target(),
aarch64_apple_watchos_sim::target(),
// TODO: x86_64-apple-tvos and x86_64-apple-watchos-sim
];
for target in all_sim_targets {
assert_eq!(target.abi, "sim")
}
}

20
compiler/rustc_target/src/spec/apple_sdk_base.rs
View File

@ -1,6 +1,10 @@
use crate::spec::{cvs, TargetOptions};
use std::borrow::Cow;
#[cfg(test)]
#[path = "apple/tests.rs"]
mod tests;
use Arch::*;
#[allow(non_camel_case_types)]
#[derive(Copy, Clone)]
@ -12,6 +16,7 @@ pub enum Arch {
Arm64_32,
I386,
X86_64,
X86_64_sim,
X86_64_macabi,
Arm64_macabi,
Arm64_sim,
@ -25,7 +30,7 @@ fn target_arch_name(arch: Arch) -> &'static str {
Arm64 | Arm64_macabi | Arm64_sim => "arm64",
Arm64_32 => "arm64_32",
I386 => "i386",
X86_64 | X86_64_macabi => "x86_64",
X86_64 | X86_64_sim | X86_64_macabi => "x86_64",
}
}
@ -33,7 +38,9 @@ fn target_abi(arch: Arch) -> &'static str {
match arch {
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | X86_64 => "",
X86_64_macabi | Arm64_macabi => "macabi",
Arm64_sim => "sim",
// x86_64-apple-ios is a simulator target, even though it isn't
// declared that way in the target like the other ones...
Arm64_sim | X86_64_sim => "sim",
}
}
@ -45,7 +52,7 @@ fn target_cpu(arch: Arch) -> &'static str {
Arm64 => "apple-a7",
Arm64_32 => "apple-s4",
I386 => "yonah",
X86_64 => "core2",
X86_64 | X86_64_sim => "core2",
X86_64_macabi => "core2",
Arm64_macabi => "apple-a12",
Arm64_sim => "apple-a12",
@ -54,7 +61,7 @@ fn target_cpu(arch: Arch) -> &'static str {
fn link_env_remove(arch: Arch) -> Cow<'static, [Cow<'static, str>]> {
match arch {
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | X86_64 | Arm64_sim => {
Armv7 | Armv7k | Armv7s | Arm64 | Arm64_32 | I386 | X86_64 | X86_64_sim | Arm64_sim => {
cvs!["MACOSX_DEPLOYMENT_TARGET"]
}
X86_64_macabi | Arm64_macabi => cvs!["IPHONEOS_DEPLOYMENT_TARGET"],
@ -62,11 +69,12 @@ fn link_env_remove(arch: Arch) -> Cow<'static, [Cow<'static, str>]> {
}
pub fn opts(os: &'static str, arch: Arch) -> TargetOptions {
let abi = target_abi(arch);
TargetOptions {
abi: target_abi(arch).into(),
abi: abi.into(),
cpu: target_cpu(arch).into(),
link_env_remove: link_env_remove(arch),
has_thread_local: false,
..super::apple_base::opts(os, target_arch_name(arch), target_abi(arch))
..super::apple_base::opts(os, target_arch_name(arch), abi)
}
}

2
compiler/rustc_target/src/spec/x86_64_apple_ios.rs
View File

@ -2,7 +2,7 @@
use crate::spec::{StackProbeType, Target, TargetOptions};
pub fn target() -> Target {
let base = opts("ios", Arch::X86_64);
let base = opts("ios", Arch::X86_64_sim);
let llvm_target = super::apple_base::ios_sim_llvm_target("x86_64");
Target {