Skip to content

Commit 6f90773

Browse files
authored
[lld/ELF] Avoid unnecessary TPOFF relocations in GOT for -pie (#81739)
With the new SystemZ port we noticed that -pie executables generated from files containing R_390_TLS_IEENT relocations will have unnecessary relocations in their GOT: 9e8d8: R_390_TLS_TPOFF *ABS*+0x18 This is caused by the config->isPic conditon in addTpOffsetGotEntry: static void addTpOffsetGotEntry(Symbol &sym) { in.got->addEntry(sym); uint64_t off = sym.getGotOffset(); if (!sym.isPreemptible && !config->isPic) { in.got->addConstant({R_TPREL, target->symbolicRel, off, 0, &sym}); return; } It is correct that we need to retain a TPOFF relocation if the target symbol is preemptible or if we're building a shared library. But when building a -pie executable, those values are fixed at link time and there's no need for any remaining dynamic relocation. Note that the equivalent MIPS-specific code in MipsGotSection::build checks for config->shared instead of config->isPic; we should use the same check here. (Note also that on many other platforms we're not even using addTpOffsetGotEntry in this case as an IE->LE relaxation is applied before; we don't have this type of relaxation on SystemZ.)
1 parent 6059671 commit 6f90773

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

lld/ELF/Relocations.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ void elf::addGotEntry(Symbol &sym) {
940940
static void addTpOffsetGotEntry(Symbol &sym) {
941941
in.got->addEntry(sym);
942942
uint64_t off = sym.getGotOffset();
943-
if (!sym.isPreemptible && !config->isPic) {
943+
if (!sym.isPreemptible && !config->shared) {
944944
in.got->addConstant({R_TPREL, target->symbolicRel, off, 0, &sym});
945945
return;
946946
}

lld/test/ELF/systemz-tls-ie.s

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
# RUN: llvm-objdump --section .data --full-contents %t | FileCheck --check-prefix=LE-DATA %s
1313
# RUN: llvm-objdump --section .got --full-contents %t | FileCheck --check-prefix=LE-GOT %s
1414

15+
## With -pie we still have the R_390_RELATIVE for the data element, but all GOT
16+
## entries should be fully resolved without any remaining R_390_TLS_TPOFF.
17+
# RUN: ld.lld -pie %t.o -o %t.pie
18+
# RUN: llvm-readelf -r %t.pie | FileCheck --check-prefix=PIE-REL %s
19+
# RUN: llvm-objdump -d --no-show-raw-insn %t.pie | FileCheck --check-prefix=PIE %s
20+
# RUN: llvm-objdump --section .data --full-contents %t.pie | FileCheck --check-prefix=PIE-DATA %s
21+
# RUN: llvm-objdump --section .got --full-contents %t.pie | FileCheck --check-prefix=PIE-GOT %s
22+
1523
# IE-REL: Relocation section '.rela.dyn' at offset {{.*}} contains 4 entries:
1624
# IE-REL: 0000000000003478 000000000000000c R_390_RELATIVE 2460
1725
# IE-REL: 0000000000002460 0000000100000038 R_390_TLS_TPOFF 0000000000000008 a + 0
@@ -58,6 +66,32 @@
5866
# LE-GOT: 1002248 00000000 00000000 ffffffff fffffff8
5967
# LE-GOT: 1002258 ffffffff fffffffc 00000000 00000000
6068

69+
# PIE-REL: Relocation section '.rela.dyn' at offset {{.*}} contains 1 entries:
70+
# PIE-REL: 00000000000033d0 000000000000000c R_390_RELATIVE 23b8
71+
72+
## TP offset for a is at 0x23b8
73+
# PIE: lgrl %r1, 0x23b8
74+
# PIE-NEXT: lgf %r1, 0(%r1,%r7)
75+
76+
## TP offset for b is at 0x23c0
77+
# PIE-NEXT: lgrl %r1, 0x23c0
78+
# PIE-NEXT: lgf %r1, 0(%r1,%r7)
79+
80+
## TP offset for c is at 0x23c8
81+
# PIE-NEXT: lgrl %r1, 0x23c8
82+
# PIE-NEXT: lgf %r1, 0(%r1,%r7)
83+
84+
## Data element: TP offset for a is at 0x23b8 (relocated via R_390_RELATIVE above)
85+
# PIE-DATA: 33d0 00000000 00000000
86+
87+
## TP offsets in GOT:
88+
# a: -8
89+
# b: -4
90+
# c: 0
91+
# PIE-GOT: 23a0 00000000 000022d0 00000000 00000000
92+
# PIE-GOT: 23b0 00000000 00000000 ffffffff fffffff8
93+
# PIE-GOT: 23c0 ffffffff fffffffc 00000000 00000000
94+
6195
ear %r7,%a0
6296
sllg %r7,%r1,32
6397
ear %r7,%a1

0 commit comments

Comments
 (0)