commit 56da313e866ddebe7f1188825346b0c31efd03fa
author Rafael Espindola <rafael.espindola@gmail.com> Mon Feb 22 19:57:55 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Feb 22 19:57:55 2016 +0000
tree 6d4ab442aa20120f4c509da5556fdff27cbb7e8c
parent 57b62c5e16b18b761c2ad5cf891deb2edde487a4

Correctly handle two gd relocations to the same symbol.

Fixes PR26676.

llvm-svn: 261561

lld/ELF/Writer.cpp

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index e8fbc2c..8ba203f 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -253,12 +253,13 @@
     return false;
 
   if (Target->isTlsGlobalDynamicRel(Type)) {
-    if (!Target->canRelaxTls(Type, Body) &&
-        Out<ELFT>::Got->addDynTlsEntry(Body)) {
-      Out<ELFT>::RelaDyn->addReloc(
-          {Target->TlsModuleIndexRel, DynamicReloc<ELFT>::Off_GTlsIndex, Body});
-      Out<ELFT>::RelaDyn->addReloc(
-          {Target->TlsOffsetRel, DynamicReloc<ELFT>::Off_GTlsOffset, Body});
+    if (!Target->canRelaxTls(Type, Body)) {
+      if (Out<ELFT>::Got->addDynTlsEntry(Body)) {
+        Out<ELFT>::RelaDyn->addReloc({Target->TlsModuleIndexRel,
+                                      DynamicReloc<ELFT>::Off_GTlsIndex, Body});
+        Out<ELFT>::RelaDyn->addReloc(
+            {Target->TlsOffsetRel, DynamicReloc<ELFT>::Off_GTlsOffset, Body});
+      }
       return true;
     }
     if (!canBePreempted(Body, true))