[lld] r358950 - [PPC64] Allow R_PPC64_DTPREL* to preemptable local-dynamic symbols

[Fangrui Song via llvm-commits]

Author: maskray
Date: Mon Apr 22 23:31:44 2019
New Revision: 358950

URL: http://llvm.org/viewvc/llvm-project?rev=358950&view=rev
Log:
[PPC64] Allow R_PPC64_DTPREL* to preemptable local-dynamic symbols

Similar to D60945.

Differential Revision: https://reviews.llvm.org/D60994

Added:
    lld/trunk/test/ELF/ppc64-tls-ld-preemptable.s
Modified:
    lld/trunk/ELF/Arch/PPC64.cpp
    lld/trunk/ELF/InputSection.cpp
    lld/trunk/ELF/Relocations.cpp

Modified: lld/trunk/ELF/Arch/PPC64.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/PPC64.cpp?rev=358950&r1=358949&r2=358950&view=diff
==============================================================================
--- lld/trunk/ELF/Arch/PPC64.cpp (original)
+++ lld/trunk/ELF/Arch/PPC64.cpp Mon Apr 22 23:31:44 2019
@@ -496,7 +496,7 @@ RelExpr PPC64::getRelExpr(RelType Type,
   case R_PPC64_DTPREL16_LO:
   case R_PPC64_DTPREL16_LO_DS:
   case R_PPC64_DTPREL64:
-    return R_ABS;
+    return R_DTPREL;
   case R_PPC64_TLSGD:
     return R_TLSDESC_CALL;
   case R_PPC64_TLSLD:

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=358950&r1=358949&r2=358950&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Mon Apr 22 23:31:44 2019
@@ -615,11 +615,10 @@ static uint64_t getRelocTargetVA(const I
                                  uint64_t P, const Symbol &Sym, RelExpr Expr) {
   switch (Expr) {
   case R_ABS:
+  case R_DTPREL:
   case R_RELAX_TLS_LD_TO_LE_ABS:
   case R_RELAX_GOT_PC_NOPIC:
     return Sym.getVA(A);
-  case R_DTPREL:
-    return Sym.getVA(A);
   case R_ADDEND:
     return A;
   case R_ARM_SBREL:

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=358950&r1=358949&r2=358950&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Mon Apr 22 23:31:44 2019
@@ -248,8 +248,7 @@ handleTlsRelocation(RelType Type, Symbol
   }
 
   // Local-Dynamic relocs can be relaxed to Local-Exec.
-  // TODO Delete R_ABS after all R_*_DTPREL_* relocations migrate to R_DTPREL.
-  if ((Expr == R_ABS || Expr == R_DTPREL) && !Config->Shared) {
+  if (Expr == R_DTPREL && !Config->Shared) {
     C.Relocations.push_back(
         {Target->adjustRelaxExpr(Type, nullptr, R_RELAX_TLS_LD_TO_LE), Type,
          Offset, Addend, &Sym});

Added: lld/trunk/test/ELF/ppc64-tls-ld-preemptable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-tls-ld-preemptable.s?rev=358950&view=auto
==============================================================================
--- lld/trunk/test/ELF/ppc64-tls-ld-preemptable.s (added)
+++ lld/trunk/test/ELF/ppc64-tls-ld-preemptable.s Mon Apr 22 23:31:44 2019
@@ -0,0 +1,35 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=ppc64le %s -o %t.o
+# RUN: ld.lld %t.o -shared -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s
+# RUN: llvm-nm %t.so | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .rodata %t.so | FileCheck --check-prefix=RODATA %s
+
+# 0x2a - 0x8000 = -32726
+# CHECK:      addis 4, 3, 0
+# CHECK-NEXT: addi 4, 4, -32726
+# CHECK-NEXT: lis 5, 0
+# CHECK-NEXT: ori 5, 5, 0
+
+# NM: 000000000000002a B i
+# RODATA: 2a000000 00000000
+
+# We used to error on R_PPC64_DTPREL* to preemptable symbols.
+# i is STB_GLOBAL and preemptable.
+.globl foo
+foo:
+  addis 4, 3, i at dtprel@ha # R_PPC64_DTPREL16_HA
+  addi 4, 4, i at dtprel@l   # R_PPC64_DTPREL16_LO
+
+  lis 5, i at dtprel@highesta # R_PPC64_DTPREL16_HIGHESTA
+  ori 5, 5, i at dtprel@highera # R_PPC64_DTPREL16_HIGHERA
+
+.section .rodata,"a", at progbits
+  .quad i at dtprel+32768
+
+.section .tbss,"awT", at nobits
+  .space 0x2a
+.globl i
+i:
+  .long 0
+  .size i, 4