<div dir="ltr">Nice!<div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 11, 2016 at 10:33 AM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Fri Mar 11 12:33:48 2016<br>
New Revision: 263271<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263271&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263271&view=rev</a><br>
Log:<br>
Now that it is trivial, fix pr26878.<br>
<br>
Added:<br>
    lld/trunk/test/ELF/tls-initial-exec-local.s<br>
Modified:<br>
    lld/trunk/ELF/Writer.cpp<br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263271&r1=263270&r2=263271&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=263271&r1=263270&r2=263271&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Fri Mar 11 12:33:48 2016<br>
@@ -420,8 +420,10 @@ void Writer<ELFT>::scanRelocs(<br>
                     !Target->isSizeRel(Type);<br>
       if (CBP || Dynrel) {<br>
         uint32_t DynType;<br>
-        if (CBP)<br>
-          DynType = Body.IsTls ? Target->TlsGotRel : Target->GotRel;<br>
+        if (Body.IsTls)<br>
+          DynType = Target->TlsGotRel;<br>
+        else if (CBP)<br>
+          DynType = Target->GotRel;<br>
         else<br>
           DynType = Target->RelativeRel;<br>
         Out<ELFT>::RelaDyn->addReloc(<br>
<br>
Added: lld/trunk/test/ELF/tls-initial-exec-local.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-initial-exec-local.s?rev=263271&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-initial-exec-local.s?rev=263271&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/tls-initial-exec-local.s (added)<br>
+++ lld/trunk/test/ELF/tls-initial-exec-local.s Fri Mar 11 12:33:48 2016<br>
@@ -0,0 +1,36 @@<br>
+// REQUIRES: x86<br>
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o<br>
+// RUN: ld.lld -shared %t.o -o %t<br>
+// RUN: llvm-readobj -r -s %t | FileCheck %s<br>
+// RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s<br>
+<br>
+// CHECK:      Name: .got<br>
+// CHECK-NEXT: Type: SHT_PROGBITS<br>
+// CHECK-NEXT: Flags [<br>
+// CHECK-NEXT:   SHF_ALLOC (0x2)<br>
+// CHECK-NEXT:   SHF_WRITE (0x1)<br>
+// CHECK-NEXT: ]<br>
+// CHECK-NEXT: Address: 0x2090<br>
+<br>
+// CHECK:      Relocations [<br>
+// CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
+// CHECK-NEXT:     0x2090 R_X86_64_TPOFF64 - 0x0<br>
+// CHECK-NEXT:     0x2098 R_X86_64_TPOFF64 - 0x4<br>
+// CHECK-NEXT:   }<br>
+// CHECK-NEXT: ]<br>
+<br>
+// 0x1007 + 4233 = 0x2090<br>
+// 0x100e + 4234 = 0x2098<br>
+// DISASM:      Disassembly of section .text:<br>
+// DISASM-NEXT: .text:<br>
+// DISASM-NEXT:  1000: {{.*}} addq      4233(%rip), %rax<br>
+// DISASM-NEXT:  1007: {{.*}} addq      4234(%rip), %rax<br>
+<br>
+        addq    foo@GOTTPOFF(%rip), %rax<br>
+        addq    bar@GOTTPOFF(%rip), %rax<br>
+<br>
+        .section        .tbss,"awT",@nobits<br>
+foo:<br>
+        .long 0<br>
+bar:<br>
+        .long 0<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>