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/master' into master-next

Browse Source 
Conflicts:
	stdlib/public/Reflection/TypeRefBuilder.cpp
This commit is contained in:
Rintaro Ishizaki
2020-03-10 12:00:12 -07:00
parent 16bf50b014 557295686a
commit a7cb72fe55
433 changed files with 16317 additions and 2814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -46,11 +46,17 @@ void forEachTargetModuleBasename(const ASTContext &Ctx,
// FIXME: We used to use "major architecture" names for these files---the
// names checked in "#if arch(...)". Fall back to that name in the one case
// where it's different from what Swift 4.2 supported: 32-bit ARM platforms.
// where it's different from what Swift 4.2 supported:
// - 32-bit ARM platforms (formerly "arm")
// - arm64e (formerly shared with "arm64")
// We should be able to drop this once there's an Xcode that supports the
// new names.
if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm)
body("arm");
else if (Ctx.LangOpts.Target.getSubArch() ==
llvm::Triple::SubArchType::AArch64SubArch_E) {
body("arm64");
}
}
enum class SearchPathKind {