Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Sources/SwiftDriver/Utilities/Triple.swift
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,14 @@ extension Triple {
arch = nil
}

let cannonicalArchName = cannonicalARMArchName(from: archName)
let canonicalArchName = canonicalARMArchName(from: archName)

if cannonicalArchName.isEmpty {
if canonicalArchName.isEmpty {
return nil
}

// Thumb only exists in v4+
if ISA == .thumb && (cannonicalArchName.hasPrefix("v2") || cannonicalArchName.hasPrefix("v3")) {
if ISA == .thumb && (canonicalArchName.hasPrefix("v2") || canonicalArchName.hasPrefix("v3")) {
return nil
}

Expand All @@ -729,7 +729,7 @@ extension Triple {
// (iwmmxt|xscale)(eb)? is also permitted. If the former, return
// "v.+", if the latter, return unmodified string, minus 'eb'.
// If invalid, return empty string.
fileprivate static func cannonicalARMArchName<S: StringProtocol>(from arch: S) -> String {
fileprivate static func canonicalARMArchName<S: StringProtocol>(from arch: S) -> String {
var name = Substring(arch)

func dropPrefix(_ prefix: String) {
Expand Down Expand Up @@ -925,7 +925,7 @@ extension Triple {
return .mips(.r6)
}

let armSubArch = Triple.Arch.cannonicalARMArchName(from: component)
let armSubArch = Triple.Arch.canonicalARMArchName(from: component)

if armSubArch.isEmpty {
switch component {
Expand Down