From 9df3605dea17e84f8183581f6103bd0c79e2a606 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 1 Jul 2017 13:22:02 +0000
Subject: Vendor import of llvm trunk r306956:
 https://llvm.org/svn/llvm-project/llvm/trunk@306956

---
 lib/BinaryFormat/Magic.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/BinaryFormat/Magic.cpp')

diff --git a/lib/BinaryFormat/Magic.cpp b/lib/BinaryFormat/Magic.cpp
index f24f22c88a8aa..b19a07a9066b0 100644
--- a/lib/BinaryFormat/Magic.cpp
+++ b/lib/BinaryFormat/Magic.cpp
@@ -191,8 +191,8 @@ file_magic llvm::identify_magic(StringRef Magic) {
     }
     break;
 
-  case 0x64: // x86-64 Windows.
-    if (Magic[1] == char(0x86))
+  case 0x64: // x86-64 or ARM64 Windows.
+    if (Magic[1] == char(0x86) || Magic[1] == char(0xaa))
       return file_magic::coff_object;
     break;
 
-- 
cgit v1.2.3