Commit ec881c80 authored by Reid Kleckner's avatar Reid Kleckner
Browse files

[msvc] Allow MSVC toolchain driver to find the aarch64 / arm64 cross-compiler.

Starting with the Fall Creators Update, Windows 10 Desktop can run on
machines that are powered by aarch64 processors.

Microsoft call the aarch64 architecture "arm64". This patch maps
ArchType::aarch64 to "arm64" to allow the MSVC toolchain driver to find
the aarch64 / arm64 cross-compiler.

Patch by Chris January

Differential Revision: https://reviews.llvm.org/D44087
parent 8be2fcb3
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ static const char *llvmArchToWindowsSDKArch(llvm::Triple::ArchType Arch) {
    return "x64";
  case ArchType::arm:
    return "arm";
  case ArchType::aarch64:
    return "arm64";
  default:
    return "";
  }
@@ -769,6 +771,8 @@ static const char *llvmArchToLegacyVCArch(llvm::Triple::ArchType Arch) {
    return "amd64";
  case ArchType::arm:
    return "arm";
  case ArchType::aarch64:
    return "arm64";
  default:
    return "";
  }
@@ -784,6 +788,8 @@ static const char *llvmArchToDevDivInternalArch(llvm::Triple::ArchType Arch) {
    return "amd64";
  case ArchType::arm:
    return "arm";
  case ArchType::aarch64:
    return "arm64";
  default:
    return "";
  }