[6.3][cherrypick] Fix module names on OpenBSD for amd64/x86_64.#89302
Merged
Conversation
In swiftlang#88224 we moved to unversioned triples. However in using the existing getUnversionedTriple implementation, we lost the call to getMajorArchitectureName and just used getArchName on the triple. On OpenBSD, the spelling is amd64. We make a number of transpositions to use the LLVM spelling x86_64 in a number of places, but the target triple by default uses amd64. This means that instead of having a mismatch between versioned and unversioned triple, we have a mismatch between architecture spellings. Here, we call getMajorArchitectureName on OpenBSD to use the LLVM architecture spellings in getUnversionedTriple for the platform. This is only a problem for amd64/x86_64; there is no problem on aarch64, which is why this wasn't spotted earlier.
Member
Author
|
@swift-ci please test. |
Member
|
@swift-ci please test Apple Silicon |
DougGregor
approved these changes
Jun 6, 2026
Member
|
@swift-ci please test macOS arm64 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Module names on OpenBSD must be transposed to the x86_64 spelling.
Minor. Affects OpenBSD only.
Of relevance to the OpenBSD port in #78437
#88353
Minor. Light refactoring change.
Local testing, passed CI.
@DougGregor