stdlib: check for ARM/ARM64 more thoroughly (NFC) #19462
Merged
Conversation
This file contains hidden or 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
Update the instances of checks for architectures to be more broad for different spellings of the architecture macro. Certain targets use `_M_ARM` and others use `__arm__`. Similarly, arm64/aarch64 has `_M_ARM64`, `__arm64__` and `__aarch64__` as spellings. This just mechanically goes through and encodes the various spellings. Take the opportunity to replace some raw checks with `defined` checks which avoids a pedantic warning due to the undefined macro when performing the check as the preprocessor may warn about an undefined condition evaluating to `0`.
|
@swift-ci please test |
|
@compnerd @jrose-apple can we get these changes pushed to the |
|
@futurejones it is going to need a new PR that cherry-picks it over. I don't think that any more releases are planned off of 4.2, so I'm not sure if we should pull this into that branch. |
|
@compnerd It doesn't matter whether there are any more releases planned of 4.2. This is blocking successful builds of 4.2 for AArch64 on the Swift Community CI. So we still need these changes pulled to the |
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.
Update the instances of checks for architectures to be more broad for different
spellings of the architecture macro. Certain targets use
_M_ARMand othersuse
__arm__. Similarly, arm64/aarch64 has_M_ARM64,__arm64__and__aarch64__as spellings. This just mechanically goes through and encodes thevarious spellings.
Take the opportunity to replace some raw checks with
definedchecks whichavoids a pedantic warning due to the undefined macro when performing the check
as the preprocessor may warn about an undefined condition evaluating to
0.Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.