Skip to content

[6.2][cherrypick] Use LLVM-default spellings for amd64 on OpenBSD. #1898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DougGregor merged 1 commit into from
May 30, 2025
Merged

[6.2][cherrypick] Use LLVM-default spellings for amd64 on OpenBSD. #1898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ import struct TSCBasic.AbsolutePath
extension GenericUnixToolchain {
private func majorArchitectureName(for triple: Triple) -> String {
// The concept of a "major" arch name only applies to Linux triples
guard triple.os == .linux else { return triple.archName }
// We change spellings for amd64/x86_64 for OpenBSD here too to match LLVM.
guard triple.os == .linux || triple.os == .openbsd else { return triple.archName }

if triple.os == .openbsd && triple.archName == "amd64" { return "x86_64" }

// HACK: We don't wrap LLVM's ARM target architecture parsing, and we should
// definitely not try to port it. This check was only normalizing
Expand Down