From bf84e2cbee8a58244f8863c849d25011e243954e Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Thu, 22 Jun 2017 19:50:56 +0000
Subject: [PATCH] Updated llvm-objdump for arm64 Mach-O MH_KEXT_BUNDLE file
 types so it symbolically disassembles the __text section from the __TEXT_EXEC
 segment not the usual __TEXT segment by default.

rdar://30590208


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@306046 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../AArch64/Inputs/kextbundle.macho-aarch64     | Bin 0 -> 49260 bytes
 .../llvm-objdump/AArch64/macho-kextbundle.test  |   9 +++++++++
 tools/llvm-objdump/MachODump.cpp                |   9 +++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100755 test/tools/llvm-objdump/AArch64/Inputs/kextbundle.macho-aarch64
 create mode 100644 test/tools/llvm-objdump/AArch64/macho-kextbundle.test

diff --git a/test/tools/llvm-objdump/AArch64/Inputs/kextbundle.macho-aarch64 b/test/tools/llvm-objdump/AArch64/Inputs/kextbundle.macho-aarch64
new file mode 100755
index 0000000000000000000000000000000000000000..4a21c2e38408360e4ed049db7c8d7a9c3cb59bf3
GIT binary patch
literal 49260
zcmeI(v1$}S7y#hey~IQen&Lo3h}IUG!Ux!p93&_);1%f>18NhvU@jn}FbMXF7CwSj
z`UW|lz%DOfV`FEdkl@ViZgL!6V;A@a{{8o#nf<f#?X~&#=jX{>2w8~ZQjCi+zT_di
zP7`rlkFgq~EW4e}Zkibz#lP#+aM-k7PJMpFsQQ$h&CYVQQdB8S$kTB-MSP{<D9iqn
z7yY`3X;Qy-v!ytDb~rT^4w|Ku%W}8Bx3zmZHQujXR7=rlI8r@&t}xawo%2JCvRql}
zE|tp<*B@1C2XQiuVt5UwZ&BB+IGv*DU6#*!BgdTBZ?<li`laV5jkE9gU~T<=XJxH=
zs}KhD6Gfftdb=*izhn9i*HXlN>F;%8PIdb2Y{W>Tc_!twzd2J{8y_2kYJIiN&H9aa
zllp%Db+>r;`QFaq;?<qr_N(^oI5*#Hig}@_2i5+OCAS0!5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UI9CG4
z`-h*7Tj6c|U+(wE`(Hl}TIJDV2yf=|;&;ez9-XVhcv%7j2oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FqfM0x$C{&q6kn&E~Bv<kMNWkWIy2b1@e35ZXo6INpXU
pS-jNsOuUWdNleu^2qEsdoc7%c<<nj-lv|IV4=;Ci`+Hk){x3LSQnvsA

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/AArch64/macho-kextbundle.test b/test/tools/llvm-objdump/AArch64/macho-kextbundle.test
new file mode 100644
index 00000000000..89194554e9c
--- /dev/null
+++ b/test/tools/llvm-objdump/AArch64/macho-kextbundle.test
@@ -0,0 +1,9 @@
+RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/kextbundle.macho-aarch64 | FileCheck %s
+
+CHECK: (__TEXT_EXEC,__text) section
+CHECK: _foo:
+CHECK:     4000:	stp	x29, x30, [sp, #-16]!
+CHECK:     4004:	mov	 x29, sp
+CHECK:     4008:	bl	_bar.stub
+CHECK:     400c:	ldp	x29, x30, [sp], #16
+CHECK:     4010:	ret
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index ec4c44a2665..05c2c3f7c4c 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -1224,8 +1224,13 @@ static void ProcessMachO(StringRef Name, MachOObjectFile *MachOOF,
     if (Error Err = MachOOF->checkSymbolTable())
       report_error(ArchiveName, FileName, std::move(Err), ArchitectureName);
 
-  if (Disassemble)
-    DisassembleMachO(FileName, MachOOF, "__TEXT", "__text");
+  if (Disassemble) {
+    if (MachOOF->getHeader().filetype == MachO::MH_KEXT_BUNDLE &&
+	MachOOF->getHeader().cputype == MachO::CPU_TYPE_ARM64)
+      DisassembleMachO(FileName, MachOOF, "__TEXT_EXEC", "__text");
+    else
+      DisassembleMachO(FileName, MachOOF, "__TEXT", "__text");
+  }
   if (IndirectSymbols)
     PrintIndirectSymbols(MachOOF, !NonVerbose);
   if (DataInCode)
-- 
2.50.1