diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-06-24 17:42:13 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-06-24 17:42:13 +0000 |
| commit | 4ebe62d309daeb0d2d69ec0470ad66a269685a9e (patch) | |
| tree | a94c206eac2f3046f6383f46eba0d3a58d267c3e | |
| parent | c2be20806736116b64eacae4ae05c102f46e54e1 (diff) | |
| download | llvm-4ebe62d309daeb0d2d69ec0470ad66a269685a9e.zip llvm-4ebe62d309daeb0d2d69ec0470ad66a269685a9e.tar.gz llvm-4ebe62d309daeb0d2d69ec0470ad66a269685a9e.tar.bz2 | |
Merging r359094:
------------------------------------------------------------------------
r359094 | maskray | 2019-04-24 07:03:30 -0700 (Wed, 24 Apr 2019) | 12 lines
[PPC64] Consider localentry offset when computing branch distance
Summary:
We don't take localentry offset into account, and thus may fail to
create a long branch when the gap is just a few bytes smaller than 2^25.
relocation R_PPC64_REL24 out of range: 33554432 is not in [-33554432, 33554431]
relocation R_PPC64_REL24 out of range: 33554436 is not in [-33554432, 33554431]
Fix that by adding the offset to the symbol VA.
Differential Revision: https://reviews.llvm.org/D61058
------------------------------------------------------------------------
llvm-svn: 364209
| -rw-r--r-- | lld/ELF/Arch/PPC64.cpp | 5 | ||||
| -rw-r--r-- | lld/test/ELF/ppc64-long-branch-localentry-offset.s | 30 |
2 files changed, 34 insertions, 1 deletions
diff --git a/lld/ELF/Arch/PPC64.cpp b/lld/ELF/Arch/PPC64.cpp index cbfa807..f02e818 100644 --- a/lld/ELF/Arch/PPC64.cpp +++ b/lld/ELF/Arch/PPC64.cpp @@ -757,7 +757,10 @@ bool PPC64::needsThunk(RelExpr Expr, RelType Type, const InputFile *File, // If the offset exceeds the range of the branch type then it will need // a range-extending thunk. - return !inBranchRange(Type, BranchAddr, S.getVA()); + // See the comment in getRelocTargetVA() about R_PPC64_CALL. + return !inBranchRange(Type, BranchAddr, + S.getVA() + + getPPC64GlobalEntryToLocalEntryOffset(S.StOther)); } uint32_t PPC64::getThunkSectionSpacing() const { diff --git a/lld/test/ELF/ppc64-long-branch-localentry-offset.s b/lld/test/ELF/ppc64-long-branch-localentry-offset.s new file mode 100644 index 0000000..fd37c13 --- /dev/null +++ b/lld/test/ELF/ppc64-long-branch-localentry-offset.s @@ -0,0 +1,30 @@ +# REQUIRES: ppc + +# RUN: llvm-mc -filetype=obj -triple=ppc64le %s -o %t.o +# RUN: ld.lld %t.o -o %t +# RUN: llvm-nm %t | FileCheck %s + +# CHECK-DAG: 0000000010010000 t __long_branch_callee +# CHECK-DAG: 0000000010010010 T _start +# CHECK-DAG: 0000000012010008 T callee + +# The bl instruction jumps to the local entry. The distance requires a long branch stub: +# localentry(callee) - _start = 0x12010008+8 - 0x10010010 = 0x2000000 + +# We used to compute globalentry(callee) - _start and caused a "R_PPC64_REL24 +# out of range" error because we didn't create the stub. + +.globl _start +_start: + bl callee + +.space 0x1fffff4 + +.globl callee +callee: +.Lgep0: + addis 2, 12, .TOC.-.Lgep0@ha + addi 2, 2, .TOC.-.Lgep0@l +.Llep0: + .localentry callee, .Llep0-.Lgep0 + blr |