From: Martin Storsjo <martin@martin.st>
Date: Sun, 6 Aug 2017 19:58:13 +0000 (+0000)
Subject: [llvm-dlltool] Map the "arm64" machine type
X-Git-Tag: llvmorg-6.0.0-rc1~10741
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9263f4e4968b3e361c610f65fcf729304fbb6f5;p=platform%2Fupstream%2Fllvm.git

[llvm-dlltool] Map the "arm64" machine type

Differential Revision: https://reviews.llvm.org/D36365

llvm-svn: 310223
---

diff --git a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
index a7de79306074..c929c9061c50 100644
--- a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
@@ -76,6 +76,7 @@ static MachineTypes getEmulation(StringRef S) {
       .Case("i386", IMAGE_FILE_MACHINE_I386)
       .Case("i386:x86-64", IMAGE_FILE_MACHINE_AMD64)
       .Case("arm", IMAGE_FILE_MACHINE_ARMNT)
+      .Case("arm64", IMAGE_FILE_MACHINE_ARM64)
       .Default(IMAGE_FILE_MACHINE_UNKNOWN);
 }
 
diff --git a/llvm/test/DllTool/coff-exports.def b/llvm/test/DllTool/coff-exports.def
index 0226886a523c..01d816f9f0e0 100644
--- a/llvm/test/DllTool/coff-exports.def
+++ b/llvm/test/DllTool/coff-exports.def
@@ -1,5 +1,7 @@
 ; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
 ; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
+; RUN: llvm-dlltool -m arm64 --input-def %s --output-lib %t.a
+; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
 
 LIBRARY test.dll
 EXPORTS