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

Merge branch 'main' into david/fix-merge-conflict

Browse Source
This commit is contained in:
David Smith
2020-10-27 13:05:20 -07:00
parent e8de6d3e48 a07dda60ef
commit 0180aca9fc
759 changed files with 23773 additions and 6047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Basic/Platform.cpp
View File

@@ -378,8 +378,10 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Minor <= 15) {
if (Micro <= 3) {
return llvm::VersionTuple(5, 1);
} else {
} else if (Micro <= 4) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
}
}
} else if (Major == 11) {
@@ -399,8 +401,10 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Major <= 13) {
if (Minor <= 3) {
return llvm::VersionTuple(5, 1);
} else {
} else if (Minor <= 4) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
}
}
} else if (Triple.isWatchOS()) {
@@ -410,8 +414,10 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
} else if (Major <= 6) {
if (Minor <= 1) {
return llvm::VersionTuple(5, 1);
} else {
} else if (Minor <= 2) {
return llvm::VersionTuple(5, 2);
} else {
return llvm::VersionTuple(5, 3);
}
}
}