Added build configuration for Apple Silicon based Macs. #1055
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Linking together with #1063 |
|
alexcrichton/openssl-src-rs#77 added aarch64-apple-darwin to openssl CI. |
briansmith
reviewed
Nov 18, 2020
| not(target_os = "ios") | ||
| not( | ||
| any(target_os = "ios", | ||
| target_os = "macos")) |
There was a problem hiding this comment.
AFAICT, this would have disabled CPU feature detection on x86-64 Macs, so I didn't take this change.
Also, when I was trying to understand your PR, I noticed the bug that PR #1100 fixes. (That bug is just a performance bug, not a correctness bug, but it is a pretty severe performance bug.)
| @@ -235,6 +235,7 @@ const ASM_TARGETS: &[(&str, Option<&str>, Option<&str>)] = &[ | |||
| ("x86_64", Some(WINDOWS), Some("nasm")), | |||
| ("x86_64", None, Some("elf")), | |||
| ("aarch64", Some("ios"), Some("ios64")), | |||
| ("aarch64", Some("macos"), Some("ios64")), | |||
There was a problem hiding this comment.
I agree that this is the right thing to do; this is what OpenSSL upstream does and this is what PR #1101 now does.
| @@ -173,21 +175,22 @@ pub(crate) mod arm { | |||
| #[cfg_attr( | |||
| any( | |||
| target_os = "ios", | |||
| target_os = "macos", | |||
There was a problem hiding this comment.
A lot of my recent changes to cpu.rs were to clean up this repetitive logic that existed just to avoid dead code warnings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added the required build configuration changes to support compilation on Apple Silicon Macs.
Tested on a Developer Transition Kit Mac.
For now, the flavor portion of the ASM_TARGETS triple is left as ios64. With some additional changes to arm-xlate.pl, we could insert a custom string here (e.g. macArm64).