diff options
| author | George Rimar <grimar@accesssoftek.com> | 2015-12-01 18:11:16 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2015-12-01 18:11:16 +0000 |
| commit | 60849f291340b3599219eb42dce91062b2f3596c (patch) | |
| tree | 25926968db83c4958bba27232652da21448828b5 /lld/ELF/Writer.cpp | |
| parent | 98ad82a6a1e33400f657e26dd0daabc49862a325 (diff) | |
| download | bcm5719-llvm-60849f291340b3599219eb42dce91062b2f3596c.tar.gz bcm5719-llvm-60849f291340b3599219eb42dce91062b2f3596c.zip | |
revert r254428 [ELF] - Refactor of tls_index implementation for tls local dynamic model.
It failed buildbot:
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/3782/steps/build/logs/stdio
Target.cpp
In file included from /home/buildbot/Buildbot/Slave/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/llvm.src/tools/lld/ELF/Target.cpp:20:
/home/buildbot/Buildbot/Slave/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/llvm.src/tools/lld/ELF/OutputSections.h:136:42: error: use of undeclared identifier 'getVA'
uint32_t getLocalTlsIndexVA() { return getVA() + LocalTlsIndexOff; }
llvm-svn: 254432
Diffstat (limited to 'lld/ELF/Writer.cpp')
| -rw-r--r-- | lld/ELF/Writer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 16dedc53a4e..11fb9b020d4 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -205,8 +205,11 @@ void Writer<ELFT>::scanRelocs( if (Target->isTlsLocalDynamicReloc(Type)) { if (Target->isTlsOptimized(Type, nullptr)) continue; - if (Out<ELFT>::Got->addLocalModelTlsIndex()) + if (Out<ELFT>::LocalModuleTlsIndexOffset == uint32_t(-1)) { + Out<ELFT>::LocalModuleTlsIndexOffset = + Out<ELFT>::Got->addLocalModuleTlsIndex(); Out<ELFT>::RelaDyn->addReloc({&C, &RI}); + } continue; } |
