New upstream version 1.49.0~beta.4+dfsg1

[rustc.git] / compiler / rustc_target / src / spec / x86_64_apple_tvos.rs

diff --git a/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs b/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
index 664a3ed8816c4c7fe67319f4ea8a3172fe44a27e..5b2a62a23fd8c604a80caed8bdd4218dbfbfae5e 100644 (file)
--- a/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
+++ b/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
@@ -1,19 +1,13 @@
 use super::apple_sdk_base::{opts, Arch};
-use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
+use crate::spec::{Target, TargetOptions};
 
-pub fn target() -> TargetResult {
-    let base = opts(Arch::X86_64);
-    Ok(Target {
+pub fn target() -> Target {
+    let base = opts("tvos", Arch::X86_64);
+    Target {
         llvm_target: "x86_64-apple-tvos".to_string(),
-        target_endian: "little".to_string(),
-        target_pointer_width: "64".to_string(),
-        target_c_int_width: "32".to_string(),
+        pointer_width: 64,
         data_layout: "e-m:o-i64:64-f80:128-n8:16:32:64-S128".to_string(),
         arch: "x86_64".to_string(),
-        target_os: "tvos".to_string(),
-        target_env: String::new(),
-        target_vendor: "apple".to_string(),
-        linker_flavor: LinkerFlavor::Gcc,
         options: TargetOptions { max_atomic_width: Some(64), stack_probes: true, ..base },
-    })
+    }
 }