From 1be37a3522b47f583675765d7cc727c7a502a590 Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Thu, 28 Apr 2016 21:07:20 +0000
Subject: [PATCH] Fix a bug in llvm-objdump for -private-headers printing the
 LC_CODE_SIGNATURE Mach-O load command.

rdar://25985653

llvm-svn: 267940
---
 .../tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64   | Bin 0 -> 8560 bytes
 .../tools/llvm-objdump/X86/macho-private-headers.test    |   7 +++++++
 llvm/tools/llvm-objdump/MachODump.cpp                    |   2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 llvm/test/tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64

diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64 b/llvm/test/tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64
new file mode 100755
index 0000000000000000000000000000000000000000..396926a06527b01d1fe9e3e7feb6b2e99fcb347a
GIT binary patch
literal 8560
zcmeHMO=uHA6rQNnVyjJ1#J|e6SgF6w!GoYeA`Px6_E!)=#>Q?<VDm$=!B!9o)kDNe
z4_*ZE?6Fr5o)q*}JbCk^5<$VE6fu6^?u^}Rtrt(qJb0P;-h1=r&6in7_AM=c`LRie
z*m@ym*9jpKP^(RdyTZauh+R+{D&=tcZ01U4bcohgiM7JtBIfDG22ze^E|0f{`0L}X
zHlZ+T6DUV)RBkCfXWCndjpj>s;V^KYR3XG0R>BEp!%)hqSIbs^nWFhzl~3=lv0l)w
z@@apNPv#uA>{JjG&F86nyHx^W^8QO!)pxz>Rr19fDj=Hgfy%c<`H92Qk{b>wYsH)S
z;-t(Mr%FC<{XQP6eEiNS#L*mqC-{`o$;qk8M8VOxHD5#J+o={2<F2hKyeAE)l!NK<
zbSMn>q2-?F`x3e*%&Tjavgpd{Od(rxW!bB&nNO$TeGAvc@6+E;l^~@%@uz%otY>_?
ziYE@|<2?@JmFMchxr^sBgXi=!VMWdfOew2km?vCUFP_^Z1FT^0c8r>9-wcdWL=q$8
z$PfKbf%#l~!*~K?2Xq)37RG7~+r#sQ6?wjtb1O!;L??8hR;>)U`Ru^tj5`TT*#l)A
zZyvqf*0Xf{^!<*bOZSe%AMS^Z^@`1#eLbWxZIFJPm+SakhlTs_9Q3hfA)e!Sv6a2C
z|JY2`a|*}K977%XtREx}VBmh&tbo6R3g>_+hoSTnr!aOyiIY76#?**mz%XDKFbo(5
z3<HJ%!@z&cz$Lr>!JhkU+4F5fIOeO&cOJHW`<q>_eYNYC8g~8FqG<4M^fTX+d0&5R
z&%Ly+zF27XJ)uclnD3s)kREIH-Nv|(qw&+nX0vHKu3NHhmMZQfe*VT_-b)`OJo5J~
zfBzoGNacT03g`Tf(TSCDe>JVaWV=5FxHT$b)A3lmb5r{QH;Bj`<ob;{5@n!az%XDK
zFbo(53<HJ%!+>GHFkl!k3>XFs1OE~OiQf1K>rJHCob#LEGK>B&n%5&0u^=k(L`s&?
zfcB<<ATf!4{5o04NoU%*Uh^FEx+fUkQ<%sXMIT>ItQU*>7z@#p<#(NI<DY`+*9+TW
zV+dM$zKtzcuI>o6>HvebDIHxgcHV;E9X<};gXs4p7<F#JK4KULWpTAgac-d_y!s5%
PKZ8E+Dn|U}fA{edT^!Q2

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-objdump/X86/macho-private-headers.test b/llvm/test/tools/llvm-objdump/X86/macho-private-headers.test
index ff45b18..e0c68d7 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-private-headers.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-private-headers.test
@@ -21,6 +21,8 @@
 // RUN:     | FileCheck %s -check-prefix=FATi386
 // RUN: llvm-objdump -p -non-verbose %p/Inputs/hello.obj.macho-x86_64 \
 // RUN:     | FileCheck %s -check-prefix=NON_VERBOSE
+// RUN: llvm-objdump -p %p/Inputs/codesig.macho-x86_64 \
+// RUN:     | FileCheck %s -check-prefix=CODESIG
 
 CHECK: Mach header
 CHECK:       magic cputype cpusubtype  caps    filetype ncmds sizeofcmds      flags
@@ -537,3 +539,8 @@ NON_VERBOSE:       extreloff 0
 NON_VERBOSE:         nextrel 0
 NON_VERBOSE:       locreloff 0
 NON_VERBOSE:         nlocrel 0
+
+CODESIG:      cmd LC_CODE_SIGNATURE
+CODESIG:  cmdsize 16
+CODESIG:  dataoff 8496
+CODESIG: datasize 64
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 1632e37..72acabd 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -8361,7 +8361,7 @@ static void PrintDylibCommand(MachO::dylib_command dl, const char *Ptr) {
 static void PrintLinkEditDataCommand(MachO::linkedit_data_command ld,
                                      uint32_t object_size) {
   if (ld.cmd == MachO::LC_CODE_SIGNATURE)
-    outs() << "      cmd LC_FUNCTION_STARTS\n";
+    outs() << "      cmd LC_CODE_SIGNATURE\n";
   else if (ld.cmd == MachO::LC_SEGMENT_SPLIT_INFO)
     outs() << "      cmd LC_SEGMENT_SPLIT_INFO\n";
   else if (ld.cmd == MachO::LC_FUNCTION_STARTS)
-- 
2.7.4