Add support for Arm64 Catalyst on ARM Macs #77484

terhechte · 2020-10-03T12:55:36Z

This is an iteration on #63467 which was merged a while ago. In the aforementioned PR, I added support for the X86_64-apple-ios-macabi target triple, which is Catalyst, iOS apps running on macOS.

Very soon, Apple will launch ARM64 based Macs which will introduce aarch64_apple_darwin.rs, macOS apps using the Darwin ABI running on ARM. This PR adds support for Catalyst apps on ARM Macs: iOS apps compiled for the darwin ABI.

I don't have access to a Apple Developer Transition Kit (DTK), so I can't really test if the generated binaries work correctly. I'm vaguely hopeful that somebody with access to a DTK could give this a spin.

rust-highfive · 2020-10-03T12:55:39Z

r? @lcnr

(rust_highfive has picked a reviewer for you, use r? to override)

lcnr · 2020-10-03T12:58:22Z

r? @Mark-Simulacrum for review or reassignment

Mark-Simulacrum · 2020-10-03T17:28:41Z

cc @shepmaster -- perhaps you know of a good reviewer here due to Apple Silicon work

shepmaster

I'm vaguely hopeful that somebody with access to a DTK could give this a spin.

I have access. What steps are required?

shepmaster · 2020-10-03T18:37:03Z

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2101,6 +2101,7 @@ fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
        ("aarch64", "tvos") => "appletvos",
        ("x86_64", "tvos") => "appletvsimulator",
        ("arm", "ios") => "iphoneos",
+        ("aarch64", "ios") if llvm_target.contains("macabi") => "macos11",


This doesn't have x like the similar target below. How can we double check this value?

You were right, it was the wrong value. I've updated it accordingly.

shepmaster · 2020-10-03T18:39:06Z

compiler/rustc_target/src/spec/apple_sdk_base.rs

@@ -20,14 +21,15 @@ fn target_cpu(arch: Arch) -> String {
        I386 => "yonah",
        X86_64 => "core2",
        X86_64_macabi => "core2",
+        Arm64_macabi => "apple-a7",


I'm surprised by this (and the other instances) because the DTK (and presumably the real commercial releases) are apple-a12 at a minimum.

Thanks! I'd overlooked this. I've updated it accordingly to a12

shepmaster · 2020-10-03T18:40:20Z

compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs

+            bitcode_llvm_cmdline: "-triple\0\
+                arm64-apple-ios-macabi\0\
+                -emit-obj\0\
+                -disable-llvm-passes\0\
+                -target-abi\0\
+                darwinpcs\0\
+                -Os\0"
+                .to_string(),


It would be good to try and get a set of updated values for this, but I don't know how.

Thanks for pointing this out! I had to remove the -target-abi darwinpcs line in order for the libraries to be accepted by Xcode.

terhechte · 2020-10-04T09:41:14Z

I'm vaguely hopeful that somebody with access to a DTK could give this a spin.

I have access. What steps are required?

@shepmaster

I've set up a demo project here https://github.com/terhechte/rust-catalyst-example
This includes a readme that explains how to build this against a local checkout of this PR. However, it also already contains pre-build binaries against this PR and an Xcode Project that integrates them. As Xcode doesn't complain (anymore) when building, I'm hopeful that the resulting binaries are valid.

In order to test this, you'd need to build the XcodeIntegration.xcodeproj, take the resulting app to a DTK and try to run it. It should print something on the console. Building should happen with the Any Mac target, which should be pre-selected.

Some Caveats:

You might need to code sign the binary. Adhoc signing should work: codesign --force --deep -s - XcodeIntegration.app
You might want to build the libtest* binaries from hand and (just for security matters) not rely on my pre-compiled ones. The Readme.md in that folder explains the process (mostly just building this PR, Rustup'ing the toolchain and executing the make_fat.sh script).

If you have any questions please reach out!

Thanks for looking into this!

terhechte · 2020-10-04T13:46:25Z

Good News! avbelow took the binaries that I build with the custom toolchain in this PR and ran them on his DTK.

https://twitter.com/avbelow/status/1312746147623120897?s=21

So it seems this is working as intended :)

below · 2020-10-04T14:03:03Z

Can confirm. I have tested this on an Apple Silicon machine and it is working as expected

Mark-Simulacrum · 2020-10-04T16:06:57Z

@pietroalbini @joshtriplett -- do we have process in place for tier 3 target additions? I forget what we've done in the past and don't see any docs at a quick glance.

pietroalbini · 2020-10-05T08:18:49Z

@Mark-Simulacrum it needs approval from someone on the compiler team.

Mark-Simulacrum · 2020-10-05T13:06:49Z

Let's r? @nikomatsakis for T-compiler approval then.

bors · 2020-10-12T02:44:16Z

☔ The latest upstream changes (presumably #75991) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

terhechte · 2020-10-12T05:23:57Z

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

src/doc/rustc/src/platform-support.md

nikomatsakis · 2020-10-16T20:54:40Z

@bors r+

bors · 2020-10-16T20:54:41Z

📌 Commit 80ac68e has been approved by nikomatsakis

…bi-arm64-target-triple, r=nikomatsakis Add support for Arm64 Catalyst on ARM Macs This is an iteration on rust-lang#63467 which was merged a while ago. In the aforementioned PR, I added support for the `X86_64-apple-ios-macabi` target triple, which is Catalyst, iOS apps running on macOS. Very soon, Apple will launch ARM64 based Macs which will introduce `aarch64_apple_darwin.rs`, macOS apps using the Darwin ABI running on ARM. This PR adds support for Catalyst apps on ARM Macs: iOS apps compiled for the darwin ABI. I don't have access to a Apple Developer Transition Kit (DTK), so I can't really test if the generated binaries work correctly. I'm vaguely hopeful that somebody with access to a DTK could give this a spin.

Dylan-DPC-zz · 2020-10-17T01:26:19Z

failed in rollup CI

Dylan-DPC-zz · 2020-10-17T01:26:26Z

@bors r-

bors · 2020-11-17T02:52:26Z

📌 Commit d5eb72c90bcd37b9db74b5cf6a0fdfb11d7b3b29 has been approved by nikomatsakis

shepmaster · 2020-11-17T02:53:29Z

@bors r-

Before we merge this, let's clean up the commit history a bit. Too many merges of master for my tastes.

nikomatsakis · 2020-11-19T14:38:23Z

I'm going to r? @shepmaster for follow-up here, please feel free to ping me if further attention is required on my part

terhechte · 2020-11-26T10:35:10Z

@nikomatsakis @shepmaster I've cleaned up the history

shepmaster · 2020-11-27T13:33:56Z

@bors r=nikomatsakis rollup=iffy

bors · 2020-11-27T13:33:58Z

📌 Commit 836d439 has been approved by nikomatsakis

bors · 2020-11-27T15:58:32Z

⌛ Testing commit 836d439 with merge 774bce7...

bors · 2020-11-27T18:22:13Z

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 774bce7 to master...

`myrust` was probably the Rust that contained rust-lang/rust#77484

…petrochenkov Fixed support for macOS Catalyst on ARM64 When I initially added Arm64 Catalyst support in rust-lang#77484 I had access to a DTK. However, while waiting to merge the PR some other changes were merged which caused conflicts in the branch. When fixing those conflicts I had no access to the DTK anymore and didn't try out if the resulting binaries did indeed work on Apple Silicon. I finally have a M1 and I realized that some small changes were necessary to support Apple Silicon. This PR adds the required changes. I've been running binaries generated with this branch for some time now and they work without issues.

Pkgsrc changes: * Adjust patches, re-compute line offsets, fix capitalization. * Remove i686/FreeBSD support, no longer provided upstream. * Bump bootstraps to 1.49.0. * Change USE_TOOLS from bsdtar to gtar. * Reduce diffs to pkgsrc-wip package patches. * Allow rust.BUILD_TARGET to override automatic choice of target. * Add an i586/NetBSD (pentium) bootstrap variant (needs testing), not yet added as bootstrap since 1.49 doesn't have that variant. Upstream changes: Version 1.50.0 (2021-02-11) ============================ Language ----------------------- - [You can now use `const` values for `x` in `[x; N]` array expressions.][79270] This has been technically possible since 1.38.0, as it was unintentionally stabilized. - [Assignments to `ManuallyDrop<T>` union fields are now considered safe.][78068] Compiler ----------------------- - [Added tier 3\* support for the `armv5te-unknown-linux-uclibceabi` target.][78142] - [Added tier 3 support for the `aarch64-apple-ios-macabi` target.][77484] - [The `x86_64-unknown-freebsd` is now built with the full toolset.][79484] \* Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries ----------------------- - [`proc_macro::Punct` now implements `PartialEq<char>`.][78636] - [`ops::{Index, IndexMut}` are now implemented for fixed sized arrays of any length.][74989] - [On Unix platforms, the `std::fs::File` type now has a "niche" of `-1`.][74699] This value cannot be a valid file descriptor, and now means `Option<File>` takes up the same amount of space as `File`. Stabilized APIs --------------- - [`bool::then`] - [`btree_map::Entry::or_insert_with_key`] - [`f32::clamp`] - [`f64::clamp`] - [`hash_map::Entry::or_insert_with_key`] - [`Ord::clamp`] - [`RefCell::take`] - [`slice::fill`] - [`UnsafeCell::get_mut`] The following previously stable methods are now `const`. - [`IpAddr::is_ipv4`] - [`IpAddr::is_ipv6`] - [`Layout::size`] - [`Layout::align`] - [`Layout::from_size_align`] - `pow` for all integer types. - `checked_pow` for all integer types. - `saturating_pow` for all integer types. - `wrapping_pow` for all integer types. - `next_power_of_two` for all unsigned integer types. - `checked_power_of_two` for all unsigned integer types. Cargo ----------------------- - [Added the `[build.rustc-workspace-wrapper]` option.][cargo/8976] This option sets a wrapper to execute instead of `rustc`, for workspace members only. - [`cargo:rerun-if-changed` will now, if provided a directory, scan the entire contents of that directory for changes.][cargo/8973] - [Added the `--workspace` flag to the `cargo update` command.][cargo/8725] Misc ---- - [The search results tab and the help button are focusable with keyboard in rustdoc.][79896] - [Running tests will now print the total time taken to execute.][75752] Compatibility Notes ------------------- - [The `compare_and_swap` method on atomics has been deprecated.][79261] It's recommended to use the `compare_exchange` and `compare_exchange_weak` methods instead. - [Changes in how `TokenStream`s are checked have fixed some cases where you could write unhygenic `macro_rules!` macros.][79472] - [`#![test]` as an inner attribute is now considered unstable like other inner macro attributes, and reports an error by default through the `soft_unstable` lint.][79003] - [Overriding a `forbid` lint at the same level that it was set is now a hard error.][78864] - [Dropped support for all cloudabi targets.][78439] - [You can no longer intercept `panic!` calls by supplying your own macro.][78343] It's recommended to use the `#[panic_handler]` attribute to provide your own implementation. - [Semi-colons after item statements (e.g. `struct Foo {};`) now produce a warning.][78296] [74989]: rust-lang/rust#74989 [79261]: rust-lang/rust#79261 [79896]: rust-lang/rust#79896 [79484]: rust-lang/rust#79484 [79472]: rust-lang/rust#79472 [79270]: rust-lang/rust#79270 [79003]: rust-lang/rust#79003 [78864]: rust-lang/rust#78864 [78636]: rust-lang/rust#78636 [78439]: rust-lang/rust#78439 [78343]: rust-lang/rust#78343 [78296]: rust-lang/rust#78296 [78068]: rust-lang/rust#78068 [75752]: rust-lang/rust#75752 [74699]: rust-lang/rust#74699 [78142]: rust-lang/rust#78142 [77484]: rust-lang/rust#77484 [cargo/8976]: rust-lang/cargo#8976 [cargo/8973]: rust-lang/cargo#8973 [cargo/8725]: rust-lang/cargo#8725 [`IpAddr::is_ipv4`]: https://doc.rust-lang.org/stable/std/net/enum.IpAddr.html#method.is_ipv4 [`IpAddr::is_ipv6`]: https://doc.rust-lang.org/stable/std/net/enum.IpAddr.html#method.is_ipv6 [`Layout::align`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.align [`Layout::from_size_align`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.from_size_align [`Layout::size`]: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html#method.size [`Ord::clamp`]: https://doc.rust-lang.org/stable/std/cmp/trait.Ord.html#method.clamp [`RefCell::take`]: https://doc.rust-lang.org/stable/std/cell/struct.RefCell.html#method.take [`UnsafeCell::get_mut`]: https://doc.rust-lang.org/stable/std/cell/struct.UnsafeCell.html#method.get_mut [`bool::then`]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then [`btree_map::Entry::or_insert_with_key`]: https://doc.rust-lang.org/stable/std/collections/btree_map/enum.Entry.html#method.or_insert_with_key [`f32::clamp`]: https://doc.rust-lang.org/stable/std/primitive.f32.html#method.clamp [`f64::clamp`]: https://doc.rust-lang.org/stable/std/primitive.f64.html#method.clamp [`hash_map::Entry::or_insert_with_key`]: https://doc.rust-lang.org/stable/std/collections/hash_map/enum.Entry.html#method.or_insert_with_key [`slice::fill`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.fill

rust-highfive assigned lcnr Oct 3, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 3, 2020

rust-highfive assigned Mark-Simulacrum and unassigned lcnr Oct 3, 2020

shepmaster reviewed Oct 3, 2020

View reviewed changes

terhechte mentioned this pull request Oct 4, 2020

Apple silicon and demo terhechte/rust-catalyst-example#2

Merged

rust-highfive assigned nikomatsakis and unassigned Mark-Simulacrum Oct 5, 2020

shepmaster reviewed Oct 12, 2020

View reviewed changes

src/doc/rustc/src/platform-support.md Outdated Show resolved Hide resolved

nikomatsakis approved these changes Oct 16, 2020

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 16, 2020

Dylan-DPC-zz mentioned this pull request Oct 17, 2020

Rollup of 9 pull requests #78032

Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 17, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 17, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 17, 2020

rust-highfive assigned shepmaster and unassigned nikomatsakis Nov 19, 2020

terhechte added 2 commits November 26, 2020 11:31

Add support for Arm64 Catalyst on ARM Macs

9677964

Add to platform-support.md

836d439

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 27, 2020

bors merged commit 774bce7 into rust-lang:master Nov 27, 2020

rustbot added this to the 1.50.0 milestone Nov 27, 2020

shepmaster mentioned this pull request Feb 1, 2021

Create a aarch64-apple-ios-sim target for rustc #81632

Closed

q231950 added a commit to q231950/rust-catalyst-example that referenced this pull request Feb 26, 2021

Use nightly Rust instead of myrust for building for Mac Catalyst ARM64

985f2fd

`myrust` was probably the Rust that contained rust-lang/rust#77484

q231950 mentioned this pull request Feb 26, 2021

Use nightly Rust instead of myrust terhechte/rust-catalyst-example#3

Closed

terhechte mentioned this pull request Feb 27, 2021

Fixed support for macOS Catalyst on ARM64 #82601

Merged

gabidi mentioned this pull request Feb 28, 2021

Mac Catalyst Sifir-io/react-native-tor#13

Open

pacowong mentioned this pull request Jul 16, 2022

Add new rustc target for x86_64 machines that can target the iphonesimulator #99312

Closed

madsmtm mentioned this pull request Jun 14, 2024

Promote Mac Catalyst targets to Tier 2 rust-lang/compiler-team#761

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Arm64 Catalyst on ARM Macs #77484

Add support for Arm64 Catalyst on ARM Macs #77484

terhechte commented Oct 3, 2020

rust-highfive commented Oct 3, 2020

lcnr commented Oct 3, 2020

Mark-Simulacrum commented Oct 3, 2020

shepmaster left a comment

shepmaster Oct 3, 2020

terhechte Oct 4, 2020

shepmaster Oct 3, 2020

terhechte Oct 4, 2020

shepmaster Oct 3, 2020

terhechte Oct 4, 2020

terhechte commented Oct 4, 2020 •

edited

Loading

terhechte commented Oct 4, 2020

below commented Oct 4, 2020

Mark-Simulacrum commented Oct 4, 2020

pietroalbini commented Oct 5, 2020

Mark-Simulacrum commented Oct 5, 2020

bors commented Oct 12, 2020

terhechte commented Oct 12, 2020

nikomatsakis commented Oct 16, 2020

bors commented Oct 16, 2020

Dylan-DPC-zz commented Oct 17, 2020

Dylan-DPC-zz commented Oct 17, 2020

bors commented Nov 17, 2020

shepmaster commented Nov 17, 2020

nikomatsakis commented Nov 19, 2020

terhechte commented Nov 26, 2020

shepmaster commented Nov 27, 2020

bors commented Nov 27, 2020

bors commented Nov 27, 2020

bors commented Nov 27, 2020

Add support for Arm64 Catalyst on ARM Macs #77484

Add support for Arm64 Catalyst on ARM Macs #77484

Conversation

terhechte commented Oct 3, 2020

rust-highfive commented Oct 3, 2020

lcnr commented Oct 3, 2020

Mark-Simulacrum commented Oct 3, 2020

shepmaster left a comment

Choose a reason for hiding this comment

shepmaster Oct 3, 2020

Choose a reason for hiding this comment

terhechte Oct 4, 2020

Choose a reason for hiding this comment

shepmaster Oct 3, 2020

Choose a reason for hiding this comment

terhechte Oct 4, 2020

Choose a reason for hiding this comment

shepmaster Oct 3, 2020

Choose a reason for hiding this comment

terhechte Oct 4, 2020

Choose a reason for hiding this comment

terhechte commented Oct 4, 2020 • edited Loading

terhechte commented Oct 4, 2020

below commented Oct 4, 2020

Mark-Simulacrum commented Oct 4, 2020

pietroalbini commented Oct 5, 2020

Mark-Simulacrum commented Oct 5, 2020

bors commented Oct 12, 2020

terhechte commented Oct 12, 2020

nikomatsakis commented Oct 16, 2020

bors commented Oct 16, 2020

Dylan-DPC-zz commented Oct 17, 2020

Dylan-DPC-zz commented Oct 17, 2020

bors commented Nov 17, 2020

shepmaster commented Nov 17, 2020

nikomatsakis commented Nov 19, 2020

terhechte commented Nov 26, 2020

shepmaster commented Nov 27, 2020

bors commented Nov 27, 2020

bors commented Nov 27, 2020

bors commented Nov 27, 2020

terhechte commented Oct 4, 2020 •

edited

Loading