rust/compiler
Matthias Krüger dc387cf295
Rollup merge of #123446 - crazytonyli:fix-watchos-llvm-target, r=estebank
Fix incorrect 'llvm_target' value used on watchOS target

## Issue

`xcodebuild -create-xcframework` command doesn't recognize static libraries that are built on "arm64_32-apple-watchos" target.

Here are steps to reproduce the issue on a Mac:
1. Install nightly toolchain `nightly-2024-03-27`. Needs this specific version, because newer nightly versions are broken on watchos target.
1. Create an empty library: `mkdir watchos-lib && cd watchos-lib && cargo init --lib`.
1. Add configuration `lib.crate-type=["staticlib"]` to Cargo.toml.
1. Build the library: `cargo +nightly-2024-03-27 build --release -Zbuild-std --target arm64_32-apple-watchos`
1. Run `xcodebuild -create-xcframework` to put the static library into a xcframework, which results in an error:

```
$ xcodebuild -create-xcframework -library target/arm64_32-apple-watchos/release/libwatchos_lib.a -output test.xcframework
error: unable to determine the platform for the given binary '.../watchos-lib/target/arm64_32-apple-watchos/release/libwatchos_lib.a'; check your deployment version settings
```

## Fix

The root cause of this error is `xcodebuild` couldn't read `LC_BUILD_VERSION` from the static library to determine the library's target platform. And the reason it's missing is that an incorrect `llvm_target` value is used in `arm64_32-apple-watchos` target. The expected value is `<arch>-apple-watchos<major>.<minor>.0`, i.e. "arm64_32-apple-watchos8.0.0".

The [.../apple/mod.rs](43f4f2a3b1/compiler/rustc_target/src/spec/base/apple/mod.rs (L321)) file contains functions that construct such string. There is an existing function `watchos_sim_llvm_target` which returns llvm target value for watchOS simulator. But there is none for watchOS device. This PR adds that missing function to align watchOS with other Apple platform targets.

To verify the fix, you can simply build a toolchain on this PR branch and repeat the steps above using the built local toolchain to verify the `xcodebuild -create-xcframework` command can create a xcframework successfully.

Furthermore, you can verify `LC_BUILD_VERSION` contains correct info by using the simple shell script below to print `LC_BUILD_VERSION` of the static library that's built on watchos target:

```shell
bin=target/arm64_32-apple-watchos/release/libwatchos_lib.a
file=$(ar -t "$bin" | grep -E '\.o$' | head -n 1)
ar -x "$bin" "$file"
vtool -show-build-version "$file"
```

Here is an example output from my machine:

```
watchos_rust-495d6aaf3bccc08d.watchos_rust.35ba42bf9255ca9d-cgu.0.rcgu.o:
Load command 1
      cmd LC_BUILD_VERSION
  cmdsize 24
 platform WATCHOS
    minos 8.0
      sdk n/a
   ntools 0
```
2024-04-07 09:17:15 +02:00
..
rustc
rustc_abi Use the Align type when parsing alignment attributes 2024-04-01 03:05:55 +01:00
rustc_arena rename ptr::invalid -> ptr::without_provenance 2024-02-21 20:15:52 +01:00
rustc_ast Rollup merge of #123397 - krtab:foreign_fn_qualif_diag, r=petrochenkov 2024-04-04 14:51:17 +02:00
rustc_ast_ir Fix typo in VisitorResult 2024-03-08 23:20:29 -05:00
rustc_ast_lowering hir: Use ItemLocalId in a couple more places 2024-04-04 14:43:49 +03:00
rustc_ast_passes Rollup merge of #123397 - krtab:foreign_fn_qualif_diag, r=petrochenkov 2024-04-04 14:51:17 +02:00
rustc_ast_pretty Auto merge of #123080 - Jules-Bertholet:mut-ref-mut, r=Nadrieril 2024-03-29 11:08:11 +00:00
rustc_attr Use the Align type when parsing alignment attributes 2024-04-01 03:05:55 +01:00
rustc_baked_icu_data
rustc_borrowck Rollup merge of #123419 - petrochenkov:zeroindex, r=compiler-errors 2024-04-03 22:11:02 +02:00
rustc_builtin_macros Fix error message for env! when env var is not valid Unicode 2024-04-01 05:44:45 +01:00
rustc_codegen_cranelift Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_codegen_gcc Rollup merge of #122334 - GuillaumeGomez:vendor-cg_gcc, r=Mark-Simulacrum 2024-04-05 16:38:49 +02:00
rustc_codegen_llvm Rollup merge of #123487 - rcvalle:rust-cfi-restore-typeid-for-instance, r=compiler-errors 2024-04-05 22:33:27 +02:00
rustc_codegen_ssa Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_const_eval Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_data_structures rustc_index: Add a ZERO constant to index types 2024-04-03 19:06:22 +03:00
rustc_driver
rustc_driver_impl Auto merge of #111769 - saethlin:ctfe-backtrace-ctrlc, r=RalfJung 2024-03-26 00:04:03 +00:00
rustc_error_codes Auto merge of #122055 - compiler-errors:stabilize-atb, r=oli-obk 2024-03-19 00:04:09 +00:00
rustc_error_messages Rename SubdiagnosticMessage as SubdiagMessage. 2024-03-05 12:14:49 +11:00
rustc_errors Rollup merge of #123401 - Zalathar:assert-size-aarch64, r=fmease 2024-04-03 20:17:06 -04:00
rustc_expand Check x86_64 size assertions on aarch64, too 2024-04-03 16:53:03 +11:00
rustc_feature Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_fluent_macro Rename SubdiagnosticMessage as SubdiagMessage. 2024-03-05 12:14:49 +11:00
rustc_fs_util Invert diagnostic lints. 2024-02-06 13:12:33 +11:00
rustc_graphviz Invert diagnostic lints. 2024-02-06 13:12:33 +11:00
rustc_hir explaining DefKind::Field 2024-04-05 23:12:43 +08:00
rustc_hir_analysis cache type info for ParamEnv 2024-04-04 18:33:38 +02:00
rustc_hir_pretty Implement mut ref/mut ref mut 2024-03-27 09:53:23 -04:00
rustc_hir_typeck Rollup merge of #123526 - estebank:issue-123442, r=compiler-errors 2024-04-06 08:56:36 +02:00
rustc_incremental Auto merge of #122070 - Zoxc:dep-edges-from-previous, r=cjgillot 2024-04-05 11:11:17 +00:00
rustc_index Check x86_64 size assertions on aarch64, too 2024-04-03 16:53:03 +11:00
rustc_index_macros rustc_index: Add a ZERO constant to index types 2024-04-03 19:06:22 +03:00
rustc_infer Switch can_eq and can_sub to DefineOpaqueTypes::Yes 2024-04-04 14:25:45 +00:00
rustc_interface Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_lexer Silence redundant error on char literal that was meant to be a string in 2021 edition 2024-03-17 23:35:19 +00:00
rustc_lint Put non_local_definitions lint back to warn-by-default 2024-04-05 19:25:58 +02:00
rustc_lint_defs rename expose_addr to expose_provenance 2024-04-03 16:00:38 +02:00
rustc_llvm Rollup merge of #123294 - Nilstrieb:reuqire-llvm-config, r=clubby789 2024-04-06 08:56:33 +02:00
rustc_log bump tracing-tree to 0.3 2024-03-30 17:39:43 +03:00
rustc_macros Rename diagnostic derive things. 2024-03-11 10:06:34 +11:00
rustc_metadata Replace RemapFileNameExt::for_codegen with explicit calls 2024-03-28 18:47:26 +01:00
rustc_middle Auto merge of #123058 - lukas-code:clauses, r=lcnr 2024-04-07 02:07:20 +00:00
rustc_mir_build Rollup merge of #123311 - Jules-Bertholet:andpat-everywhere, r=Nadrieril 2024-04-05 16:38:50 +02:00
rustc_mir_dataflow rustc_index: Add a ZERO constant to index types 2024-04-03 19:06:22 +03:00
rustc_mir_transform Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_monomorphize Only allow upstream calls to LLVM intrinsics, not any link_name function 2024-04-01 20:31:19 -04:00
rustc_next_trait_solver Require foldability part of interner item bounds, remove redundant where clauses 2024-03-28 12:30:52 -04:00
rustc_parse Rollup merge of #123401 - Zalathar:assert-size-aarch64, r=fmease 2024-04-03 20:17:06 -04:00
rustc_parse_format Check x86_64 size assertions on aarch64, too 2024-04-03 16:53:03 +11:00
rustc_passes Do not ICE on field access check on expr with ty::Error 2024-04-06 16:34:57 +00:00
rustc_pattern_analysis Fix union handling in exhaustiveness 2024-04-01 00:01:46 +02:00
rustc_privacy Rename hir::Local into hir::LetStmt 2024-03-22 20:36:21 +01:00
rustc_query_impl Verify that query keys result in unique dep nodes 2024-03-12 05:31:41 +01:00
rustc_query_system Remove sharding for VecCache 2024-04-06 10:49:31 -04:00
rustc_resolve Rollup merge of #123307 - tgross35:f16-f128-feature-gate-fix, r=petrochenkov 2024-04-03 20:17:05 -04:00
rustc_serialize Stabilize associated type bounds 2024-03-08 20:56:25 +00:00
rustc_session Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_smir rename expose_addr to expose_provenance 2024-04-03 16:00:38 +02:00
rustc_span Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00
rustc_symbol_mangling Rollup merge of #123525 - maurer:no-id-dyn2, r=compiler-errors 2024-04-06 08:56:35 +02:00
rustc_target Rollup merge of #123446 - crazytonyli:fix-watchos-llvm-target, r=estebank 2024-04-07 09:17:15 +02:00
rustc_trait_selection Add a debug asserts call to match_projection_projections to ensure invariant 2024-04-06 14:45:48 -03:00
rustc_traits Merge check_mod_impl_wf and check_mod_type_wf 2024-03-07 06:27:09 +00:00
rustc_transmute Remove unnecessary Partial/Ord derive 2024-03-27 14:02:15 +00:00
rustc_ty_utils Rollup merge of #123464 - fmease:rn-has-proj-to-has-aliases, r=compiler-errors 2024-04-04 21:16:58 -04:00
rustc_type_ir Auto merge of #123058 - lukas-code:clauses, r=lcnr 2024-04-07 02:07:20 +00:00
stable_mir Put checks that detect UB under their own flag below debug_assertions 2024-04-06 11:21:47 -04:00