about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-20 07:13:53 +0000
committerbors <bors@rust-lang.org>2023-12-20 07:13:53 +0000
commit3095d31a759e569a9da3fe908541f301a211ea66 (patch)
treefcca6cf049d30c331985e0aa849b94485e865845
parent5810deef6941025e6f60bb9a5f7b2a6ca8a9bf76 (diff)
parentfd0033c777bab3f57d648f3bfeedae6a7e83c220 (diff)
downloadrust-3095d31a759e569a9da3fe908541f301a211ea66.tar.gz
rust-3095d31a759e569a9da3fe908541f301a211ea66.zip
Auto merge of #119118 - arttet:feature/fix-arm64e-targets, r=petrochenkov
Fix arm64e-apple-ios target

- [x] [Remove legacy `bitcode` defaults](https://github.com/rust-lang/rust/pull/117364)
- [x] Use LLVM features

Now we have warnings such as

```
'+paca' is not a recognized feature for this target (ignoring feature)
'+pacg' is not a recognized feature for this target (ignoring feature)
```

Because we should use LLVM features.
-rw-r--r--compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs15
1 files changed, 5 insertions, 10 deletions
diff --git a/compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs b/compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs
index 8daa78a02ed..38657d7f1df 100644
--- a/compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/targets/arm64e_apple_ios.rs
@@ -7,23 +7,18 @@ pub fn target() -> Target {
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::THREAD;
 
     Target {
+        // Clang automatically chooses a more specific target based on
+        // IPHONEOS_DEPLOYMENT_TARGET.
+        // This is required for the target to pick the right
+        // MACH-O commands, so we do too.
         llvm_target: ios_llvm_target(arch).into(),
         pointer_width: 64,
         data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".into(),
         arch: arch.target_arch(),
         options: TargetOptions {
-            features: "+neon,+fp-armv8,+apple-a12,+v8.3a,+paca,+pacg".into(),
+            features: "+neon,+fp-armv8,+apple-a12,+v8.3a,+pauth".into(),
             max_atomic_width: Some(128),
-            forces_embed_bitcode: true,
             frame_pointer: FramePointer::NonLeaf,
-            bitcode_llvm_cmdline: "-triple\0\
-                arm64e-apple-ios14.1.0\0\
-                -emit-obj\0\
-                -disable-llvm-passes\0\
-                -target-abi\0\
-                darwinpcs\0\
-                -Os\0"
-                .into(),
             ..base
         },
     }