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

rust-lang · Oct 23, 2022 · d2a3784 · d2a3784
1 parent 79eedef
commit d2a3784
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/compiler/rustc_target/src/spec/apple/tests.rs b/compiler/rustc_target/src/spec/apple/tests.rs
@@ -1,12 +1,16 @@
-use crate::spec::{aarch64_apple_ios_sim, aarch64_apple_watchos_sim, x86_64_apple_ios};
+use crate::spec::{
+    aarch64_apple_ios_sim, aarch64_apple_watchos_sim, x86_64_apple_ios, x86_64_apple_tvos,
+};
 
 #[test]
 fn simulator_targets_set_abi() {
     let all_sim_targets = [
         x86_64_apple_ios::target(),
+        x86_64_apple_tvos::target(),
         aarch64_apple_ios_sim::target(),
+        // Note: There is currently no ARM64 tvOS simulator target
         aarch64_apple_watchos_sim::target(),
-        // TODO: x86_64-apple-tvos and x86_64-apple-watchos-sim
+        // TODO: x86_64-apple-watchos-sim
     ];
 
     for target in all_sim_targets {

diff --git a/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs b/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
@@ -2,7 +2,7 @@ use super::apple_sdk_base::{opts, Arch};
 use crate::spec::{StackProbeType, Target, TargetOptions};
 
 pub fn target() -> Target {
-    let base = opts("tvos", Arch::X86_64);
+    let base = opts("tvos", Arch::X86_64_sim);
     Target {
         llvm_target: "x86_64-apple-tvos".into(),
         pointer_width: 64,