[lld] r261561 - Correctly handle two gd relocations to the same symbol.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Feb 22 13:57:55 2016
New Revision: 261561

URL: http://llvm.org/viewvc/llvm-project?rev=261561&view=rev
Log:
Correctly handle two gd relocations to the same symbol.

Fixes PR26676.

Added:
    lld/trunk/test/ELF/tls-two-relocs.s
Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=261561&r1=261560&r2=261561&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Mon Feb 22 13:57:55 2016
@@ -253,12 +253,13 @@ static bool handleTlsRelocation(unsigned
     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))

Added: lld/trunk/test/ELF/tls-two-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-two-relocs.s?rev=261561&view=auto
==============================================================================
--- lld/trunk/test/ELF/tls-two-relocs.s (added)
+++ lld/trunk/test/ELF/tls-two-relocs.s Mon Feb 22 13:57:55 2016
@@ -0,0 +1,30 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+// RUN: ld.lld %t -o %tout -shared
+// RUN: llvm-readobj -r %tout | FileCheck %s
+
+ data16
+ leaq   g_tls_s at TLSGD(%rip), %rdi
+ data16
+ data16
+ rex64
+ callq  __tls_get_addr at PLT
+
+ data16
+ leaq   g_tls_s at TLSGD(%rip), %rdi
+ data16
+ data16
+ rex64
+ callq  __tls_get_addr at PLT
+
+// Check that we handle two gd relocations to the same symbol.
+
+// CHECK:      Relocations [
+// CHECK-NEXT:   Section (4) .rela.dyn {
+// CHECK-NEXT:     R_X86_64_DTPMOD64 g_tls_s 0x0
+// CHECK-NEXT:     R_X86_64_DTPOFF64 g_tls_s 0x0
+// CHECK-NEXT:   }
+// CHECK-NEXT:   Section (5) .rela.plt {
+// CHECK-NEXT:      R_X86_64_JUMP_SLOT __tls_get_addr 0x0
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]