Skip to content

Commit 119a9c3

Browse files
committed
arm64 macOS was introduced with version Swift
Generalize the check from arm64e to also include arm64. Fixes rdar://83502661.
1 parent 18bb92d commit 119a9c3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

lib/Basic/Platform.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -369,27 +369,27 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
369369
if (Triple.isMacOSX()) {
370370
Triple.getMacOSXVersion(Major, Minor, Micro);
371371

372-
auto floorFor64e = [&Triple](llvm::VersionTuple v) {
373-
if (Triple.getArchName() != "arm64e") return v;
374-
// macOS got first arm64e support in 11.0, i.e. VersionTuple(5, 3)
372+
auto floorFor64 = [&Triple](llvm::VersionTuple v) {
373+
if (!Triple.isAArch64()) return v;
374+
// macOS got first arm64(e) support in 11.0, i.e. VersionTuple(5, 3)
375375
return MAX(v, llvm::VersionTuple(5, 3));
376376
};
377377

378378
if (Major == 10) {
379379
if (Triple.isAArch64() && Minor <= 16)
380-
return floorFor64e(llvm::VersionTuple(5, 3));
380+
return floorFor64(llvm::VersionTuple(5, 3));
381381

382382
if (Minor <= 14) {
383-
return floorFor64e(llvm::VersionTuple(5, 0));
383+
return floorFor64(llvm::VersionTuple(5, 0));
384384
} else if (Minor <= 15) {
385385
if (Micro <= 3) {
386-
return floorFor64e(llvm::VersionTuple(5, 1));
386+
return floorFor64(llvm::VersionTuple(5, 1));
387387
} else {
388-
return floorFor64e(llvm::VersionTuple(5, 2));
388+
return floorFor64(llvm::VersionTuple(5, 2));
389389
}
390390
}
391391
} else if (Major == 11) {
392-
return floorFor64e(llvm::VersionTuple(5, 3));
392+
return floorFor64(llvm::VersionTuple(5, 3));
393393
}
394394
} else if (Triple.isiOS()) { // includes tvOS
395395
Triple.getiOSVersion(Major, Minor, Micro);

0 commit comments

Comments
 (0)