diff options
| -rw-r--r-- | llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 | bin | 0 -> 33112 bytes | |||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 b/llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 Binary files differnew file mode 100644 index 00000000000..5a61a78247a --- /dev/null +++ b/llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test b/llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test new file mode 100644 index 00000000000..69ff25436b6 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test @@ -0,0 +1,6 @@ +RUN: llvm-objdump -d -m -no-show-raw-insn -arch all %p/Inputs/fat.macho-armv7s-arm64 | FileCheck %s + +CHECK: (architecture armv7s): +CHECK: bx r12 +CHECK: (architecture arm64): +CHECK: fmul d16, d0, d2 diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index e1e42c2e218..006ba5765e7 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -6439,8 +6439,11 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, // GetTarget prints out stuff. return; } + std::string MachOMCPU; if (MCPU.empty() && McpuDefault) - MCPU = McpuDefault; + MachOMCPU = McpuDefault; + else + MachOMCPU = MCPU; std::unique_ptr<const MCInstrInfo> InstrInfo(TheTarget->createMCInstrInfo()); std::unique_ptr<const MCInstrInfo> ThumbInstrInfo; @@ -6462,7 +6465,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, std::unique_ptr<const MCAsmInfo> AsmInfo( TheTarget->createMCAsmInfo(*MRI, TripleName)); std::unique_ptr<const MCSubtargetInfo> STI( - TheTarget->createMCSubtargetInfo(TripleName, MCPU, FeaturesStr)); + TheTarget->createMCSubtargetInfo(TripleName, MachOMCPU, FeaturesStr)); MCContext Ctx(AsmInfo.get(), MRI.get(), nullptr); std::unique_ptr<MCDisassembler> DisAsm( TheTarget->createMCDisassembler(*STI, Ctx)); @@ -6512,7 +6515,8 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, ThumbAsmInfo.reset( ThumbTarget->createMCAsmInfo(*ThumbMRI, ThumbTripleName)); ThumbSTI.reset( - ThumbTarget->createMCSubtargetInfo(ThumbTripleName, MCPU, FeaturesStr)); + ThumbTarget->createMCSubtargetInfo(ThumbTripleName, MachOMCPU, + FeaturesStr)); ThumbCtx.reset(new MCContext(ThumbAsmInfo.get(), ThumbMRI.get(), nullptr)); ThumbDisAsm.reset(ThumbTarget->createMCDisassembler(*ThumbSTI, *ThumbCtx)); MCContext *PtrThumbCtx = ThumbCtx.get(); |
