From 5b7369ddf5ffc606823f54cc90eab19b12173f5d Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Tue, 16 Dec 2014 21:48:27 +0000 Subject: [PATCH] =?utf8?q?Fix=20a=20bug=20in=20llvm-objdump=E2=80=99s=20-p?= =?utf8?q?rivate-headers=20for=20the=20LC=5FVERSION=5FMIN=5FIPHONEOS=20loa?= =?utf8?q?d=20command=20not=20getting=20printed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224376 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-objdump/ARM/macho-private-headers.test | 4 ++++ tools/llvm-objdump/MachODump.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/tools/llvm-objdump/ARM/macho-private-headers.test b/test/tools/llvm-objdump/ARM/macho-private-headers.test index f88d91f0dd2..a569b8d6432 100644 --- a/test/tools/llvm-objdump/ARM/macho-private-headers.test +++ b/test/tools/llvm-objdump/ARM/macho-private-headers.test @@ -303,6 +303,10 @@ EXE: cmd LC_UUID EXE: cmdsize 24 EXE: uuid C2D9351C-1EF1-330B-A2AB-EED6CF7D2C5D EXE: Load command 9 +EXE: cmd LC_VERSION_MIN_IPHONEOS +EXE: cmdsize 16 +EXE: version 8.0 +EXE: sdk 8.0 EXE: Load command 10 EXE: cmd LC_SOURCE_VERSION EXE: cmdsize 16 diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index e0203ba1266..454d3d15771 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -3738,7 +3738,8 @@ static void PrintLoadCommands(const MachOObjectFile *Obj, uint32_t ncmds, } else if (Command.C.cmd == MachO::LC_RPATH) { MachO::rpath_command Rpath = Obj->getRpathCommand(Command); PrintRpathLoadCommand(Rpath, Command.Ptr); - } else if (Command.C.cmd == MachO::LC_VERSION_MIN_MACOSX) { + } else if (Command.C.cmd == MachO::LC_VERSION_MIN_MACOSX || + Command.C.cmd == MachO::LC_VERSION_MIN_IPHONEOS) { MachO::version_min_command Vd = Obj->getVersionMinLoadCommand(Command); PrintVersionMinLoadCommand(Vd); } else if (Command.C.cmd == MachO::LC_SOURCE_VERSION) { -- 2.34.1