[6.2][cherrypick] Use LLVM-default spellings for amd64 on OpenBSD. #81112
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
OpenBSD spells the common 64-bit x86 architecture as amd64, while LLVM defaults it to x86_64. A while back we tried to stick with the amd64 spelling, but this was difficult to make the change properly and consistently. A while back we decided to just stick with LLVM spellings, but there are a few minor cases missing. This change is necessary for properly finding swiftrt.o.
|
@swift-ci please test. |
|
FreeBSD also uses the term |
|
Yes, but perhaps that should be left to a separate change, since this is just an OpenBSD-specific cherrypick? I also can't readily test FreeBSD changes. |
tbkka
approved these changes
Apr 26, 2025
|
@swift-ci Please test |
|
@swift-ci Please smoke test |
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.
OpenBSD spells the common 64-bit x86 architecture as amd64, while LLVM defaults it to x86_64. A while back we tried to stick with the amd64 spelling, but this was difficult to make the change properly and consistently. A while back we decided to just stick with LLVM spellings, but there are a few minor cases missing.
This change is necessary for properly finding swiftrt.o.
Changes are conditioned on OpenBSD triples only.
See also #78437 for the master issue tracking OpenBSD.
#80919
Risk is minimal, since this is scoped only to OpenBSD.
CI has ran on the original prs. OpenBSD x86-targeted builds require this change.
@DougGregor