From 46a9b9f81a1c0050562bf15c37bb5b944a194c07 Mon Sep 17 00:00:00 2001 From: WildCat Date: Mon, 25 Apr 2022 21:19:56 +0800 Subject: [PATCH] Update Mac Catalyst support for Clang 13 --- compiler/rustc_target/src/spec/apple_base.rs | 5 +++++ compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_target/src/spec/apple_base.rs b/compiler/rustc_target/src/spec/apple_base.rs index 238d3f8bda5ff..22858b32d5210 100644 --- a/compiler/rustc_target/src/spec/apple_base.rs +++ b/compiler/rustc_target/src/spec/apple_base.rs @@ -114,3 +114,8 @@ pub fn ios_sim_llvm_target(arch: &str) -> String { let (major, minor) = ios_deployment_target(); format!("{}-apple-ios{}.{}.0-simulator", arch, major, minor) } + +pub fn macabi_llvm_target(arch: &str) -> String { + let (major, minor) = ios_deployment_target(); + format!("{}-apple-ios{}.{}.0-macabi", arch, major, minor) +} diff --git a/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs index c75632571ad38..12dca728d3be4 100644 --- a/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs +++ b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs @@ -3,8 +3,10 @@ use crate::spec::{StackProbeType, Target, TargetOptions}; pub fn target() -> Target { let base = opts("ios", Arch::X86_64_macabi); + let arch = "x86_64"; + let llvm_target = super::apple_base::macabi_llvm_target(arch); Target { - llvm_target: "x86_64-apple-ios13.0-macabi".into(), + llvm_target: llvm_target.into(), pointer_width: 64, data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" .into(),