Skip to content

Commit 6b9a5e6

Browse files
committed
[lld][Hexagon] Add General Dynamic relocations (GD)
Differential revision: https://reviews.llvm.org/D72522
1 parent cbf08d0 commit 6b9a5e6

File tree

2 files changed

+62
-0
lines changed

2 files changed

+62
-0
lines changed

lld/ELF/Arch/Hexagon.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ Hexagon::Hexagon() {
5555
defaultMaxPageSize = 0x10000;
5656
noneRel = R_HEX_NONE;
5757
tlsGotRel = R_HEX_TPREL_32;
58+
tlsModuleIndexRel = R_HEX_DTPMOD_32;
59+
tlsOffsetRel = R_HEX_DTPREL_32;
5860
}
5961

6062
uint32_t Hexagon::calcEFlags() const {
@@ -102,6 +104,7 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
102104
case R_HEX_32_6_X:
103105
case R_HEX_HI16:
104106
case R_HEX_LO16:
107+
case R_HEX_DTPREL_32:
105108
return R_ABS;
106109
case R_HEX_B9_PCREL:
107110
case R_HEX_B13_PCREL:
@@ -121,6 +124,10 @@ RelExpr Hexagon::getRelExpr(RelType type, const Symbol &s,
121124
case R_HEX_IE_HI16:
122125
case R_HEX_IE_LO16:
123126
return R_GOT;
127+
case R_HEX_GD_GOT_11_X:
128+
case R_HEX_GD_GOT_16_X:
129+
case R_HEX_GD_GOT_32_6_X:
130+
return R_TLSGD_GOTPLT;
124131
case R_HEX_GOTREL_11_X:
125132
case R_HEX_GOTREL_16_X:
126133
case R_HEX_GOTREL_32_6_X:
@@ -240,6 +247,7 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
240247
or32le(loc, applyMask(0x00203fe0, val & 0x3f));
241248
break;
242249
case R_HEX_11_X:
250+
case R_HEX_GD_GOT_11_X:
243251
case R_HEX_IE_GOT_11_X:
244252
case R_HEX_GOT_11_X:
245253
case R_HEX_GOTREL_11_X:
@@ -252,6 +260,7 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
252260
case R_HEX_16_X: // These relocs only have 6 effective bits.
253261
case R_HEX_IE_16_X:
254262
case R_HEX_IE_GOT_16_X:
263+
case R_HEX_GD_GOT_16_X:
255264
case R_HEX_GOT_16_X:
256265
case R_HEX_GOTREL_16_X:
257266
case R_HEX_TPREL_16_X:
@@ -262,9 +271,11 @@ void Hexagon::relocateOne(uint8_t *loc, RelType type, uint64_t val) const {
262271
break;
263272
case R_HEX_32:
264273
case R_HEX_32_PCREL:
274+
case R_HEX_DTPREL_32:
265275
or32le(loc, val);
266276
break;
267277
case R_HEX_32_6_X:
278+
case R_HEX_GD_GOT_32_6_X:
268279
case R_HEX_GOT_32_6_X:
269280
case R_HEX_GOTREL_32_6_X:
270281
case R_HEX_IE_GOT_32_6_X:

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# REQUIRES: hexagon
2+
# RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %s -o %t.o
3+
# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOC %s
4+
# RUN: ld.lld %t.o -o %t
5+
# RUN: ld.lld -shared %t.o -o %t.so
6+
# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t | FileCheck %s
7+
# RUN: llvm-objdump -d --no-show-raw-insn --print-imm-hex %t.so | FileCheck %s
8+
# RUN: llvm-readobj -x .got %t | FileCheck -check-prefix=GOT %s
9+
# RUN: llvm-readobj -x .got %t.so | FileCheck -check-prefix=GOT-SHARED %s
10+
# RUN: llvm-readobj -x .tdata %t | FileCheck -check-prefix=TDATA %s
11+
# RUN: llvm-readobj -x .tdata %t.so | FileCheck -check-prefix=TDATA %s
12+
# RUN: llvm-readobj -r %t | FileCheck -check-prefix=RELA %s
13+
# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=RELA-SHARED %s
14+
15+
.globl _start
16+
.type _start, @function
17+
18+
_start:
19+
# RELOC: 0x0 R_HEX_GD_GOT_32_6_X a 0x0
20+
# RELOC-NEXT: 0x4 R_HEX_GD_GOT_16_X a 0x0
21+
# CHECK: { immext(#0xfffeffc0)
22+
# CHECK-NEXT: r0 = add(r1,##-0x10008) }
23+
r0 = add(r1, ##a@GDGOT)
24+
25+
# RELOC: 0x8 R_HEX_GD_GOT_32_6_X a 0x0
26+
# RELOC-NEXT: 0xC R_HEX_GD_GOT_11_X a 0x0
27+
# CHECK-NEXT: { immext(#0xfffeffc0)
28+
# CHECK-NEXT: r0 = memw(r1+##-0x10008) }
29+
r0 = memw(r1+##a@GDGOT)
30+
31+
# GOT: Hex dump of section '.got':
32+
# GOT-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000
33+
34+
# GOT-SHARED: Hex dump of section '.got':
35+
# GOT-SHARED-NEXT: 0x{{[0-9a-f]+}} 00000000 00000000
36+
37+
# TDATA: Hex dump of section '.tdata':
38+
# TDATA-NEXT: 01000000
39+
40+
# RELA: Relocations [
41+
# RELA-NEXT: ]
42+
43+
# RELA-SHARED: .rela.dyn {
44+
# RELA-SHARED-NEXT: 0x2024C R_HEX_DTPMOD_32 a 0x0
45+
# RELA-SHARED-NEXT: 0x20250 R_HEX_DTPREL_32 a 0x0
46+
# RELA-SHARED-NEXT: }
47+
48+
.section .tdata,"awT",@progbits
49+
.globl a
50+
a:
51+
.word 1

0 commit comments

Comments
 (0)