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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-09-30 15:11:41 -07:00
parent 3f18865559 52a9713fb7
commit c51550f30e
199 changed files with 6656 additions and 1378 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);