aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-07-06 15:34:09 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-07-06 15:34:09 +0000
commitd94942eacdeb6ebb3750a700e6410e7691dd70e5 (patch)
treead193d65c3e5f0da5008886a54cf0e4010f94b0a
parent444e4712399dfed9a74a0a1bd4880ea138a86616 (diff)
downloadsrc-vendor/lld-80.tar.gz
src-vendor/lld-80.zip
Notes
Notes: svn path=/vendor/lld/dist-release_80/; revision=349785 svn path=/vendor/lld/lld-release_801-r366581/; revision=350174; tag=vendor/lld/lld-release_801-r366581
-rw-r--r--ELF/Arch/PPC64.cpp5
-rw-r--r--test/ELF/ppc64-long-branch-localentry-offset.s30
2 files changed, 34 insertions, 1 deletions
diff --git a/ELF/Arch/PPC64.cpp b/ELF/Arch/PPC64.cpp
index cbfa8073d33f..f02e818daee5 100644
--- a/ELF/Arch/PPC64.cpp
+++ b/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/test/ELF/ppc64-long-branch-localentry-offset.s b/test/ELF/ppc64-long-branch-localentry-offset.s
new file mode 100644
index 000000000000..fd37c13db6ba
--- /dev/null
+++ b/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