From 1c2b2f9c56c01aa1c317da4fd0234eaa1fe6e739 Mon Sep 17 00:00:00 2001
From: Tim Northover <Tim.Northover@arm.com>
Date: Mon, 17 Dec 2012 17:59:32 +0000
Subject: [PATCH] Teach MachO which sections contain code

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170349 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Object/MachOFormat.h                 |   4 ++++
 lib/MC/MCParser/DarwinAsmParser.cpp               |   2 +-
 lib/Object/MachOObjectFile.cpp                    |   4 ++--
 .../Inputs/macho-text-sections.macho-x86_64       | Bin 0 -> 268 bytes
 test/Object/X86/macho-text-sections.test          |   3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 test/Object/Inputs/macho-text-sections.macho-x86_64
 create mode 100644 test/Object/X86/macho-text-sections.test

diff --git a/include/llvm/Object/MachOFormat.h b/include/llvm/Object/MachOFormat.h
index c0f700d3c87..a17d58dae23 100644
--- a/include/llvm/Object/MachOFormat.h
+++ b/include/llvm/Object/MachOFormat.h
@@ -237,6 +237,10 @@ namespace macho {
   /// @name Section Data
   /// @{
 
+  enum SectionFlags {
+    SF_PureInstructions = 0x80000000
+  };
+
   struct Section {
     char Name[16];
     char SegmentName[16];
diff --git a/lib/MC/MCParser/DarwinAsmParser.cpp b/lib/MC/MCParser/DarwinAsmParser.cpp
index 20c949dbdaa..7b042df292e 100644
--- a/lib/MC/MCParser/DarwinAsmParser.cpp
+++ b/lib/MC/MCParser/DarwinAsmParser.cpp
@@ -314,7 +314,7 @@ bool DarwinAsmParser::ParseSectionSwitch(const char *Segment,
   Lex();
 
   // FIXME: Arch specific.
-  bool isText = StringRef(Segment) == "__TEXT";  // FIXME: Hack.
+  bool isText = TAA & MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS;
   getStreamer().SwitchSection(getContext().getMachOSection(
                                 Segment, Section, TAA, StubSize,
                                 isText ? SectionKind::getText()
diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index a38fac78aae..40f5390a96f 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/lib/Object/MachOObjectFile.cpp
@@ -559,11 +559,11 @@ error_code MachOObjectFile::isSectionText(DataRefImpl DRI,
   if (is64BitLoadCommand(MachOObj.get(), DRI)) {
     InMemoryStruct<macho::Section64> Sect;
     getSection64(DRI, Sect);
-    Result = !strcmp(Sect->Name, "__text");
+    Result = Sect->Flags & macho::SF_PureInstructions;
   } else {
     InMemoryStruct<macho::Section> Sect;
     getSection(DRI, Sect);
-    Result = !strcmp(Sect->Name, "__text");
+    Result = Sect->Flags & macho::SF_PureInstructions;
   }
   return object_error::success;
 }
diff --git a/test/Object/Inputs/macho-text-sections.macho-x86_64 b/test/Object/Inputs/macho-text-sections.macho-x86_64
new file mode 100644
index 0000000000000000000000000000000000000000..cce203ba0d8830f01b58aa43c82963f64f529816
GIT binary patch
literal 268
zcmX^A>+L^w1_nlE1|R{&FMu=*NCFwie3&?lW`Z&}K$?L7#s`|o0KzbSe0)i2MF~g+
u1jNUOxJHD)c$hTIJS3S0BsN2Qd|p1XiRgToTA2M9=CLrKnAdrLfdK%nloM|N

literal 0
HcmV?d00001

diff --git a/test/Object/X86/macho-text-sections.test b/test/Object/X86/macho-text-sections.test
new file mode 100644
index 00000000000..1b697dcadad
--- /dev/null
+++ b/test/Object/X86/macho-text-sections.test
@@ -0,0 +1,3 @@
+RUN: llvm-objdump -disassemble %p/../Inputs/macho-text-sections.macho-x86_64 | FileCheck %s
+
+CHECK: Disassembly of section __notext,__notext