[ModuleInterface] Remove fallback behavior for arm64e -> arm64.

Addresses rdar://problem/61407215.
This commit is contained in:
Varun Gandhi
2020-04-21 18:08:29 -07:00
parent 93958ed76b
commit c4134ca452
2 changed files with 3 additions and 6 deletions

View File

@@ -49,14 +49,10 @@ void forEachTargetModuleBasename(const ASTContext &Ctx,
// 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 (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)
if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm) {
body("arm");
else if (Ctx.LangOpts.Target.getSubArch() ==
llvm::Triple::SubArchType::AArch64SubArch_E) {
body("arm64");
}
}