averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm64 macOS was introduced with version Swift

Browse Source 
Generalize the check from arm64e to also include arm64. Fixes
rdar://83502661.
This commit is contained in:
Doug Gregor
2021-09-27 14:04:12 -07:00
parent b1236e92f9
commit f4aa6266df
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Basic/Platform.cpp
View File

@@ -375,27 +375,27 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
if (Triple.isMacOSX()) {
Triple.getMacOSXVersion(Major, Minor, Micro);
auto floorFor64e = [&Triple](llvm::VersionTuple v) {
if (Triple.getArchName() != "arm64e") return v;
// macOS got first arm64e support in 11.0, i.e. VersionTuple(5, 3)
auto floorFor64 = [&Triple](llvm::VersionTuple v) {
if (!Triple.isAArch64()) return v;
// macOS got first arm64(e) support in 11.0, i.e. VersionTuple(5, 3)
return MAX(v, llvm::VersionTuple(5, 3));
};
if (Major == 10) {
if (Triple.isAArch64() && Minor <= 16)
return floorFor64e(llvm::VersionTuple(5, 3));
return floorFor64(llvm::VersionTuple(5, 3));
if (Minor <= 14) {
return floorFor64e(llvm::VersionTuple(5, 0));
return floorFor64(llvm::VersionTuple(5, 0));
} else if (Minor <= 15) {
if (Micro <= 3) {
return floorFor64e(llvm::VersionTuple(5, 1));
return floorFor64(llvm::VersionTuple(5, 1));
} else {
return floorFor64e(llvm::VersionTuple(5, 2));
return floorFor64(llvm::VersionTuple(5, 2));
}
}
} else if (Major == 11) {
return floorFor64e(llvm::VersionTuple(5, 3));
return floorFor64(llvm::VersionTuple(5, 3));
}
} else if (Triple.isiOS()) { // includes tvOS
Triple.getiOSVersion(Major, Minor, Micro);