commit 7a165755ba460af8912a9fbdac6ccda210c8bf15
author Kevin Enderby <enderby@apple.com> Tue Jan 24 23:41:04 2017 +0000
committer Kevin Enderby <enderby@apple.com> Tue Jan 24 23:41:04 2017 +0000
tree 7ba24fccceb87e5839359bcc909de98f8c0bb5ce
parent 3cd9e94241664fb89281c44fa3d680b2bede43d9

Fix llvm-objdump so it picks a good CPU based for Mach-O files
for CPU_SUBTYPE_ARM_V7S and CPU_SUBTYPE_ARM_V7K.

For these two cpusubtypes they should default to a cortex-a7 CPU
to give proper disassembly without a -mcpu= flag.

rdar://27431703

llvm-svn: 292993

llvm/lib/Object/MachOObjectFile.cpp

diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index ae1ac09..c0a7518 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -2454,6 +2454,8 @@
         *ArchFlag = "armv7em";
       return Triple("thumbv7em-apple-darwin");
     case MachO::CPU_SUBTYPE_ARM_V7K:
+      if (McpuDefault)
+        *McpuDefault = "cortex-a7";
       if (ArchFlag)
         *ArchFlag = "armv7k";
       return Triple("armv7k-apple-darwin");
@@ -2464,6 +2466,8 @@
         *ArchFlag = "armv7m";
       return Triple("thumbv7m-apple-darwin");
     case MachO::CPU_SUBTYPE_ARM_V7S:
+      if (McpuDefault)
+        *McpuDefault = "cortex-a7";
       if (ArchFlag)
         *ArchFlag = "armv7s";
       return Triple("armv7s-apple-darwin");