diff options
| author | Kevin Enderby <enderby@apple.com> | 2017-01-24 23:41:04 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2017-01-24 23:41:04 +0000 |
| commit | 7a165755ba460af8912a9fbdac6ccda210c8bf15 (patch) | |
| tree | 7ba24fccceb87e5839359bcc909de98f8c0bb5ce /llvm/lib/Object/MachOObjectFile.cpp | |
| parent | 3cd9e94241664fb89281c44fa3d680b2bede43d9 (diff) | |
| download | bcm5719-llvm-7a165755ba460af8912a9fbdac6ccda210c8bf15.tar.gz bcm5719-llvm-7a165755ba460af8912a9fbdac6ccda210c8bf15.zip | |
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
Diffstat (limited to 'llvm/lib/Object/MachOObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index ae1ac097169..c0a7518d1e6 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -2454,6 +2454,8 @@ Triple MachOObjectFile::getArchTriple(uint32_t CPUType, uint32_t CPUSubType, *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 @@ Triple MachOObjectFile::getArchTriple(uint32_t CPUType, uint32_t CPUSubType, *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"); |
