From b95a050b983e57d751dfb51f942dbedc7db420ba Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Wed, 31 Jan 2018 00:00:41 +0000
Subject: [PATCH] llvm-nm should show a symbol type of T for symbols in the
 (__TEXT_EXEC,__text) section.

When a the Apple link editor builds a kext bundle file type and the
value of the -miphoneos-version-min argument is significantly current
(like 11.0) then the (__TEXT,__text) section is changed to the
(__TEXT_EXEC,__text) section.  So it would be nice for llvm-nm to
show symbols in that section with a type of T instead of the generic
type of S for some section other than text, data, etc.

rdar://36262205

llvm-svn: 323836
---
 .../AArch64/Inputs/kextbundle.macho-aarch64     | Bin 0 -> 49260 bytes
 llvm/test/tools/llvm-nm/AArch64/lit.local.cfg   |   2 ++
 .../tools/llvm-nm/AArch64/macho-kextbundle.test |   4 ++++
 llvm/tools/llvm-nm/llvm-nm.cpp                  |   4 ++++
 4 files changed, 10 insertions(+)
 create mode 100755 llvm/test/tools/llvm-nm/AArch64/Inputs/kextbundle.macho-aarch64
 create mode 100644 llvm/test/tools/llvm-nm/AArch64/lit.local.cfg
 create mode 100644 llvm/test/tools/llvm-nm/AArch64/macho-kextbundle.test

diff --git a/llvm/test/tools/llvm-nm/AArch64/Inputs/kextbundle.macho-aarch64 b/llvm/test/tools/llvm-nm/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/llvm/test/tools/llvm-nm/AArch64/lit.local.cfg b/llvm/test/tools/llvm-nm/AArch64/lit.local.cfg
new file mode 100644
index 000000000000..7184443994b6
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/AArch64/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'AArch64' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/tools/llvm-nm/AArch64/macho-kextbundle.test b/llvm/test/tools/llvm-nm/AArch64/macho-kextbundle.test
new file mode 100644
index 000000000000..28c9f249efb4
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/AArch64/macho-kextbundle.test
@@ -0,0 +1,4 @@
+RUN: llvm-nm %p/Inputs/kextbundle.macho-aarch64 | FileCheck %s
+
+CHECK: 0000000000004014 s _bar.stub
+CHECK: 0000000000004000 T _foo
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index b6ac9c20a946..2b18a3ce8c31 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -1004,6 +1004,10 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) {
     StringRef SectionName;
     Obj.getSectionName(Ref, SectionName);
     StringRef SegmentName = Obj.getSectionFinalSegmentName(Ref);
+    if (Obj.is64Bit() && 
+        Obj.getHeader64().filetype == MachO::MH_KEXT_BUNDLE &&
+        SegmentName == "__TEXT_EXEC" && SectionName == "__text")
+      return 't';
     if (SegmentName == "__TEXT" && SectionName == "__text")
       return 't';
     if (SegmentName == "__DATA" && SectionName == "__data")