[lld] 6b9a5e6 - [lld][Hexagon] Add General Dynamic relocations (GD)

[Sid Manning via llvm-commits]

Author: Sid Manning
Date: 2020-01-21T14:10:03-06:00
New Revision: 6b9a5e6f05f9413f50b5ff7266e9108b6affa43a

URL: https://github.com/llvm/llvm-project/commit/6b9a5e6f05f9413f50b5ff7266e9108b6affa43a
DIFF: https://github.com/llvm/llvm-project/commit/6b9a5e6f05f9413f50b5ff7266e9108b6affa43a.diff

LOG: [lld][Hexagon] Add General Dynamic relocations (GD)

Differential revision: https://reviews.llvm.org/D72522

Added: 
    lld/test/ELF/hexagon-tls-gd.s

Modified: 
    lld/ELF/Arch/Hexagon.cpp

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Arch/Hexagon.cpp b/lld/ELF/Arch/Hexagon.cpp
index 106bc9bab5bd..51e34910e6cc 100644
--- a/lld/ELF/Arch/Hexagon.cpp
+++ b/lld/ELF/Arch/Hexagon.cpp
@@ -55,6 +55,8 @@ Hexagon::Hexagon() {
   defaultMaxPageSize = 0x10000;
   noneRel = R_HEX_NONE;
   tlsGotRel = R_HEX_TPREL_32;
+  tlsModuleIndexRel = R_HEX_DTPMOD_32;
+  tlsOffsetRel = R_HEX_DTPREL_32;
 }
 
 uint32_t Hexagon::calcEFlags() const {
@@ -102,6 +104,7 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
   case R_HEX_32_6_X:
   case R_HEX_HI16:
   case R_HEX_LO16:
+  case R_HEX_DTPREL_32:
     return R_ABS;
   case R_HEX_B9_PCREL:
   case R_HEX_B13_PCREL:
@@ -121,6 +124,10 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
   case R_HEX_IE_HI16:
   case R_HEX_IE_LO16:
     return R_GOT;
+  case R_HEX_GD_GOT_11_X:
+  case R_HEX_GD_GOT_16_X:
+  case R_HEX_GD_GOT_32_6_X:
+    return R_TLSGD_GOTPLT;
   case R_HEX_GOTREL_11_X:
   case R_HEX_GOTREL_16_X:
   case R_HEX_GOTREL_32_6_X:
@@ -240,6 +247,7 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
     or32le(loc, applyMask(0x00203fe0, val & 0x3f));
     break;
   case R_HEX_11_X:
+  case R_HEX_GD_GOT_11_X:
   case R_HEX_IE_GOT_11_X:
   case R_HEX_GOT_11_X:
   case R_HEX_GOTREL_11_X:
@@ -252,6 +260,7 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
   case R_HEX_16_X: // These relocs only have 6 effective bits.
   case R_HEX_IE_16_X:
   case R_HEX_IE_GOT_16_X:
+  case R_HEX_GD_GOT_16_X:
   case R_HEX_GOT_16_X:
   case R_HEX_GOTREL_16_X:
   case R_HEX_TPREL_16_X:
@@ -262,9 +271,11 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
     break;
   case R_HEX_32:
   case R_HEX_32_PCREL:
+  case R_HEX_DTPREL_32:
     or32le(loc, val);
     break;
   case R_HEX_32_6_X:
+  case R_HEX_GD_GOT_32_6_X:
   case R_HEX_GOT_32_6_X:
   case R_HEX_GOTREL_32_6_X:
   case R_HEX_IE_GOT_32_6_X:

diff  --git a/lld/test/ELF/hexagon-tls-gd.s b/lld/test/ELF/hexagon-tls-gd.s
new file mode 100644
index 000000000000..9727518f79c2
--- /dev/null
+++ b/lld/test/ELF/hexagon-tls-gd.s
@@ -0,0 +1,51 @@
+# REQUIRES: hexagon
+# RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOC %s
+# RUN: ld.lld %t.o -o %t
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t.so | FileCheck %s
+# RUN: llvm-readobj -x .got %t | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -x .got %t.so | FileCheck -check-prefix=GOT-SHARED %s
+# RUN: llvm-readobj -x .tdata %t | FileCheck -check-prefix=TDATA %s
+# RUN: llvm-readobj -x .tdata %t.so | FileCheck -check-prefix=TDATA %s
+# RUN: llvm-readobj -r %t | FileCheck -check-prefix=RELA %s
+# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=RELA-SHARED %s
+
+.globl _start
+.type _start, @function
+
+_start:
+# RELOC:      0x0 R_HEX_GD_GOT_32_6_X a 0x0
+# RELOC-NEXT: 0x4 R_HEX_GD_GOT_16_X a 0x0
+# CHECK:      {   immext(#0xfffeffc0)
+# CHECK-NEXT:     r0 = add(r1,##-0x10008) }
+                  r0 = add(r1, ##a at GDGOT)
+
+# RELOC:      0x8 R_HEX_GD_GOT_32_6_X a 0x0
+# RELOC-NEXT: 0xC R_HEX_GD_GOT_11_X a 0x0
+# CHECK-NEXT: {   immext(#0xfffeffc0)
+# CHECK-NEXT:     r0 = memw(r1+##-0x10008) }
+                  r0 = memw(r1+##a at GDGOT)
+
+# GOT: Hex dump of section '.got':
+# GOT-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000
+
+# GOT-SHARED: Hex dump of section '.got':
+# GOT-SHARED-NEXT: 0x{{[0-9a-f]+}} 00000000 00000000
+
+# TDATA: Hex dump of section '.tdata':
+# TDATA-NEXT: 01000000
+
+# RELA: Relocations [
+# RELA-NEXT: ]
+
+# RELA-SHARED:      .rela.dyn {
+# RELA-SHARED-NEXT:   0x2024C R_HEX_DTPMOD_32 a 0x0
+# RELA-SHARED-NEXT:   0x20250 R_HEX_DTPREL_32 a 0x0
+# RELA-SHARED-NEXT: }
+
+.section        .tdata,"awT", at progbits
+.globl  a
+a:
+.word 1