objdump: identify WoA WinCOFF/ARM correctly
authorSaleem Abdulrasool <compnerd@compnerd.org>
Thu, 17 Apr 2014 06:17:23 +0000 (06:17 +0000)
committerSaleem Abdulrasool <compnerd@compnerd.org>
Thu, 17 Apr 2014 06:17:23 +0000 (06:17 +0000)
Since LLVM currently only supports WinCOFF, assume that the input is WinCOFF
rather than another type of COFF file (ECOFF/XCOFF).  If the architecture is
detected as thumb (e.g. the file has a IMAGE_FILE_MACHINE_ARMNT magic) then use
a triple of thumbv7-windows.

This allows for objdump to properly handle WoA object files without having to
specify the target triple manually.

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

tools/llvm-objdump/llvm-objdump.cpp

index 9d043f18c2e5ef4db7c71299d5e809527205ce6f..a4b94c9b6adf388bf5d844722ce204a095538d1b 100644 (file)
@@ -167,6 +167,12 @@ static const Target *getTarget(const ObjectFile *Obj = NULL) {
       // the best we can do here is indicate that it is mach-o.
       if (Obj->isMachO())
         TheTriple.setObjectFormat(Triple::MachO);
+
+      if (Obj->isCOFF()) {
+        const auto COFFObj = dyn_cast<COFFObjectFile>(Obj);
+        if (COFFObj->getArch() == Triple::thumb)
+          TheTriple.setTriple("thumbv7-windows");
+      }
     }
   } else
     TheTriple.setTriple(Triple::normalize(TripleName));