[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 a7de7930607469617b975f5781358e8f8faf7111..c929c9061c50af74c14e66e319da47a3235a5659 100644 (file)
--- 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 0226886a523cdc9c691e76181e18e9a681f0a442..01d816f9f0e0c7229aafe94a411ea8bcc62eaba5 100644 (file)
--- 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