summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Golin <renato.golin@linaro.org>2016-04-26 10:02:02 +0000
committerRenato Golin <renato.golin@linaro.org>2016-04-26 10:02:02 +0000
commit5a55a029c01e9f93e555911935cbb7b2635dd0b9 (patch)
tree7227e9faa66de44bdf58c85ba7b3374f6407b80f
parente9b2548f294c902b6431645b1c44667468f180f4 (diff)
downloadbcm5719-llvm-5a55a029c01e9f93e555911935cbb7b2635dd0b9.tar.gz
bcm5719-llvm-5a55a029c01e9f93e555911935cbb7b2635dd0b9.zip
Revert "ARM: put correct symbol index on indirect pointers in __thread_ptr."
This reverts commit r267488, as it broke some ARM buildbots. llvm-svn: 267541
-rw-r--r--llvm/lib/MC/MachObjectWriter.cpp3
-rw-r--r--llvm/test/MC/ARM/tls-directives.s6
2 files changed, 2 insertions, 7 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index e39271949d9..f33b866e6a5 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -471,8 +471,7 @@ void MachObjectWriter::bindIndirectSymbols(MCAssembler &Asm) {
ie = Asm.indirect_symbol_end(); it != ie; ++it, ++IndirectIndex) {
const MCSectionMachO &Section = cast<MCSectionMachO>(*it->Section);
- if (Section.getType() != MachO::S_NON_LAZY_SYMBOL_POINTERS &&
- Section.getType() != MachO::S_THREAD_LOCAL_VARIABLE_POINTERS)
+ if (Section.getType() != MachO::S_NON_LAZY_SYMBOL_POINTERS)
continue;
// Initialize the section indirect symbol base, if necessary.
diff --git a/llvm/test/MC/ARM/tls-directives.s b/llvm/test/MC/ARM/tls-directives.s
index 69a02689289..c0e9f6cc142 100644
--- a/llvm/test/MC/ARM/tls-directives.s
+++ b/llvm/test/MC/ARM/tls-directives.s
@@ -1,9 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-apple-ios -filetype=obj -o %t %s
-@ RUN: llvm-objdump -macho -p -indirect-symbols %t | FileCheck %s
-
-@ CHECK: Indirect symbols for (__DATA,__thread_ptr)
-@ CHECK: 0x0000001c 5 _a
-
+@ RUN: llvm-objdump -p %t | FileCheck %s
@ CHECK: sectname __thread_data
@ CHECK: segname __DATA
OpenPOWER on IntegriCloud