]> granicus.if.org Git - clang/commitdiff
[msvc] Allow MSVC toolchain driver to find the aarch64 / arm64 cross-compiler.
authorReid Kleckner <rnk@google.com>
Mon, 5 Mar 2018 21:36:23 +0000 (21:36 +0000)
committerReid Kleckner <rnk@google.com>
Mon, 5 Mar 2018 21:36:23 +0000 (21:36 +0000)
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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326744 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains/MSVC.cpp

index ae41ee9e22cf1d10ad350db7dca2ffc25edc56cc..8458c0396ee3a45b191914ae55895624e1057be7 100644 (file)
@@ -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 "";
   }