From b0f12dfab6b938351d373ca26c3ee56fd91fad8b Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 13 Mar 2014 07:02:35 +0000
Subject: [PATCH] Support: add support to identify WinCOFF/ARM objects

Add the Windows COFF ARM object file magic.  This enables the LLVM tools to
interact with COFF object files for Windows on ARM.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203761 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Object/COFFObjectFile.cpp                       |   4 ++++
 lib/Support/Path.cpp                                |   1 +
 test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm | Bin 0 -> 367 bytes
 test/tools/llvm-readobj/file-headers.test           |  17 +++++++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100755 test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm

diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp
index 6ef2fbfed53..461dbac1168 100644
--- a/lib/Object/COFFObjectFile.cpp
+++ b/lib/Object/COFFObjectFile.cpp
@@ -663,6 +663,8 @@ StringRef COFFObjectFile::getFileFormatName() const {
     return "COFF-i386";
   case COFF::IMAGE_FILE_MACHINE_AMD64:
     return "COFF-x86-64";
+  case COFF::IMAGE_FILE_MACHINE_ARMNT:
+    return "COFF-ARM";
   default:
     return "COFF-<unknown arch>";
   }
@@ -674,6 +676,8 @@ unsigned COFFObjectFile::getArch() const {
     return Triple::x86;
   case COFF::IMAGE_FILE_MACHINE_AMD64:
     return Triple::x86_64;
+  case COFF::IMAGE_FILE_MACHINE_ARMNT:
+    return Triple::thumb;
   default:
     return Triple::UnknownArch;
   }
diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index 6fdad22158d..895e81f4946 100644
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -1016,6 +1016,7 @@ error_code has_magic(const Twine &path, const Twine &magic, bool &result) {
     case 0x66: // MPS R4000 Windows
     case 0x50: // mc68K
     case 0x4c: // 80386 Windows
+    case 0xc4: // ARMNT Windows
       if (Magic[1] == 0x01)
         return file_magic::coff_object;
 
diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm b/test/tools/llvm-readobj/Inputs/trivial.obj.coff-arm
new file mode 100755
index 0000000000000000000000000000000000000000..e3b5df4c778476149f6baf693243ab0db2bba480
GIT binary patch
literal 367
zcmY*VJx>Bb5S`_Wg%$J`t1&?eZmEsMMJp2siTnb&9gfAj-OKL6C053giqaoMDETiY
z_BbmXfk|H8y!qJKyftgU*Y(Y42LP9Z5V5qF`UUP4KtzeGMa@@Dn#1utyBpP|Z%VRS
z95{jI6X*Pb<PTv<=mTqou9%tvMQVytqm`mE_Fd%pq7WXP7sK(4J|SLoIrmOfN=s9@
zZaFm?yXL>=Vq$oJ#}?cI{6cuNy<tZlsMH!~CZ6BFcKERLs!$(FXZ)E?svIrNC*gdo
rWP7uP9eEHzGQl?=_j)S^pZm(G9gKD&77RI$Q!5(OidZn?Jc0**2i-}i

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-readobj/file-headers.test b/test/tools/llvm-readobj/file-headers.test
index b2b454772d6..845bad87930 100644
--- a/test/tools/llvm-readobj/file-headers.test
+++ b/test/tools/llvm-readobj/file-headers.test
@@ -1,3 +1,5 @@
+RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-arm \
+RUN:   | FileCheck %s -check-prefix COFF-ARM
 RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-i386 \
 RUN:   | FileCheck %s -check-prefix COFF32
 RUN: llvm-readobj -h %p/Inputs/trivial.obj.coff-x86-64 \
@@ -13,6 +15,21 @@ RUN:   | FileCheck %s -check-prefix COFF-UNKNOWN
 RUN: llvm-readobj -h %p/Inputs/magic.coff-importlib \
 RUN:   | FileCheck %s -check-prefix COFF-IMPORTLIB
 
+COFF-ARM:      File: {{(.*[/\\])?}}trivial.obj.coff-arm
+COFF-ARM-NEXT: Format: COFF-ARM
+COFF-ARM-NEXT: Arch: thumb
+COFF-ARM-NEXT: AddressSize: 32bit
+COFF-ARM-NEXT: ImageFileHeader {
+COFF-ARM-NEXT:   Machine: IMAGE_FILE_MACHINE_ARMNT (0x1C4)
+COFF-ARM-NEXT:   SectionCount: 2
+COFF-ARM-NEXT:   TimeDateStamp: 2014-03-13 02:48:34 (0x53211C82)
+COFF-ARM-NEXT:   PointerToSymbolTable: 0xFF
+COFF-ARM-NEXT:   SymbolCount: 6
+COFF-ARM-NEXT:   OptionalHeaderSize: 0
+COFF-ARM-NEXT:   Characteristics [ (0x0)
+COFF-ARM-NEXT:   ]
+COFF-ARM-NEXT: }
+
 COFF32:      File: {{(.*[/\\])?}}trivial.obj.coff-i386
 COFF32-NEXT: Format: COFF-i386
 COFF32-NEXT: Arch: i386
-- 
2.11.0