Skip to content

[lld/ELF] Avoid unnecessary TPOFF relocations in GOT for -pie #81739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2024
Merged

[lld/ELF] Avoid unnecessary TPOFF relocations in GOT for -pie #81739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lld/ELF/Relocations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ void elf::addGotEntry(Symbol &sym) {
static void addTpOffsetGotEntry(Symbol &sym) {
in.got->addEntry(sym);
uint64_t off = sym.getGotOffset();
if (!sym.isPreemptible && !config->isPic) {
if (!sym.isPreemptible && !config->shared) {
in.got->addConstant({R_TPREL, target->symbolicRel, off, 0, &sym});
return;
}
Expand Down
34 changes: 34 additions & 0 deletions lld/test/ELF/systemz-tls-ie.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
# RUN: llvm-objdump --section .data --full-contents %t | FileCheck --check-prefix=LE-DATA %s
# RUN: llvm-objdump --section .got --full-contents %t | FileCheck --check-prefix=LE-GOT %s

## With -pie we still have the R_390_RELATIVE for the data element, but all GOT
## entries should be fully resolved without any remaining R_390_TLS_TPOFF.
# RUN: ld.lld -pie %t.o -o %t.pie
# RUN: llvm-readelf -r %t.pie | FileCheck --check-prefix=PIE-REL %s
# RUN: llvm-objdump -d --no-show-raw-insn %t.pie | FileCheck --check-prefix=PIE %s
# RUN: llvm-objdump --section .data --full-contents %t.pie | FileCheck --check-prefix=PIE-DATA %s
Copy link
Member

@MaskRay MaskRay Feb 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To inspect section content, llvm-readelf -x .got -x .data is shorter:)

# RUN: llvm-objdump --section .got --full-contents %t.pie | FileCheck --check-prefix=PIE-GOT %s

# IE-REL: Relocation section '.rela.dyn' at offset {{.*}} contains 4 entries:
# IE-REL: 0000000000003478 000000000000000c R_390_RELATIVE 2460
# IE-REL: 0000000000002460 0000000100000038 R_390_TLS_TPOFF 0000000000000008 a + 0
Expand Down Expand Up @@ -58,6 +66,32 @@
# LE-GOT: 1002248 00000000 00000000 ffffffff fffffff8
# LE-GOT: 1002258 ffffffff fffffffc 00000000 00000000

# PIE-REL: Relocation section '.rela.dyn' at offset {{.*}} contains 1 entries:
# PIE-REL: 00000000000033d0 000000000000000c R_390_RELATIVE 23b8

## TP offset for a is at 0x23b8
# PIE: lgrl %r1, 0x23b8
# PIE-NEXT: lgf %r1, 0(%r1,%r7)

## TP offset for b is at 0x23c0
# PIE-NEXT: lgrl %r1, 0x23c0
# PIE-NEXT: lgf %r1, 0(%r1,%r7)

## TP offset for c is at 0x23c8
# PIE-NEXT: lgrl %r1, 0x23c8
# PIE-NEXT: lgf %r1, 0(%r1,%r7)

## Data element: TP offset for a is at 0x23b8 (relocated via R_390_RELATIVE above)
# PIE-DATA: 33d0 00000000 00000000

## TP offsets in GOT:
# a: -8
# b: -4
# c: 0
# PIE-GOT: 23a0 00000000 000022d0 00000000 00000000
# PIE-GOT: 23b0 00000000 00000000 ffffffff fffffff8
# PIE-GOT: 23c0 ffffffff fffffffc 00000000 00000000

ear %r7,%a0
sllg %r7,%r1,32
ear %r7,%a1
Expand Down