Skip to content

Commit

Permalink
[ELF][PPC] Don't relax ifunc toc-indirect accesses to toc-relative
Browse files Browse the repository at this point in the history
Fixes PR42759.

```
// If ifunc is taken address in -fPIC code, it may have a toc entry
.section .toc,"aw",@progbits
  .quad ifunc

// ifunc may be defined as STT_GNU_IFUNC in another object file
.type ifunc, %gnu_indirect_function
```

If ifunc is non-preemptable (e.g. when linking an executable), the toc
entry will be relocated by R_PPC64_IRELATIVE.

R_*_IRELATIVE represents the symbolic value of a
non-preemptable ifunc (not associated with a canonical PLT) in a writable location. It has an unknown value at
link time, so we cannot apply toc-indirect to toc-relative relaxation.

Reviewed By: luporl, sfertile

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

llvm-svn: 368057
  • Loading branch information
MaskRay committed Aug 6, 2019
1 parent 9c52f66 commit c55c059
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lld/ELF/Arch/PPC64.cpp
Expand Up @@ -172,7 +172,11 @@ bool elf::tryRelaxPPC64TocIndirection(RelType type, const Relocation &rel,
: getRelaTocSymAndAddend<ELF64BE>(tocISB, rel.addend);

// Only non-preemptable defined symbols can be relaxed.
if (!d || d->isPreemptible)
//
// The toc entry of a non-preemptable ifunc is relocated by R_PPC64_IRELATIVE,
// which will run at load time to determine the relocated value. It is not
// known until load time, so the access cannot be relaxed.
if (!d || d->isPreemptible || d->isGnuIFunc())
return false;

// Two instructions can materialize a 32-bit signed offset from the toc base.
Expand Down
20 changes: 20 additions & 0 deletions lld/test/ELF/ppc64-toc-relax-ifunc.s
@@ -0,0 +1,20 @@
# REQUIRES: ppc

# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
# RUN: echo '.globl ifunc; .type ifunc, %gnu_indirect_function; ifunc:' | \
# RUN: llvm-mc -filetype=obj -triple=powerpc64le - -o %t1.o
# RUN: ld.lld %t.o %t1.o -o %t
# RUN: llvm-objdump -d %t | FileCheck %s

## ifunc is a non-preemptable STT_GNU_IFUNC. Its toc entry will be
## relocated by R_PPC64_IRELATIVE, not representable by a toc-relative value.
## Check the toc-indirect access is not relaxed.

# CHECK: nop
# CHECK-NEXT: ld 3, -32768(2)

addis 3, 2, .toc@toc@ha
ld 3, .toc@toc@l(3)

.section .toc,"aw",@progbits
.quad ifunc

0 comments on commit c55c059

Please sign in to comment.