Skip to content

Commit 9ed736a

Browse files
committed
cmd/link/internal: fix use of DynlinkingGo with ppc64le trampolines
When creating programs with large text sections on ppc64le, trampolines are needed for calls that are too far; however they are not created if the code is generated such that the TOC register r2 is initialized and maintained in the code because then the external linker can create the trampolines. Previously the function DynlinkingGo was used to determine this but in the case where plugins are used, this could return true even though r2 is not valid. To fix this problem I've added a new function r2Valid which returns true when the build options indicate that the r2 is initialized and maintained. Because of the ways that DynlinkingGo is used I wanted to maintain its previous behavior. Fixes #45850 Change-Id: I6d902eba6ad41757aa6474948b79acdbd479cb38 Reviewed-on: https://go-review.googlesource.com/c/go/+/315289 Trust: Lynn Boger <[email protected]> Run-TryBot: Lynn Boger <[email protected]> Reviewed-by: Cherry Zhang <[email protected]> TryBot-Result: Go Bot <[email protected]>
1 parent 30674ae commit 9ed736a

File tree

1 file changed

+12
-2
lines changed
  • src/cmd/link/internal/ppc64

1 file changed

+12
-2
lines changed

src/cmd/link/internal/ppc64/asm.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,24 @@ func archrelocaddr(ldr *loader.Loader, target *ld.Target, syms *ld.ArchSyms, r l
651651
return int64(o2)<<32 | int64(o1)
652652
}
653653

654+
// Determine if the code was compiled so that the TOC register R2 is initialized and maintained
655+
func r2Valid(ctxt *ld.Link) bool {
656+
switch ctxt.BuildMode {
657+
case ld.BuildModeCArchive, ld.BuildModeCShared, ld.BuildModePIE, ld.BuildModeShared, ld.BuildModePlugin:
658+
return true
659+
}
660+
// -linkshared option
661+
return ctxt.IsSharedGoLink()
662+
}
663+
654664
// resolve direct jump relocation r in s, and add trampoline if necessary
655665
func trampoline(ctxt *ld.Link, ldr *loader.Loader, ri int, rs, s loader.Sym) {
656666

657667
// Trampolines are created if the branch offset is too large and the linker cannot insert a call stub to handle it.
658668
// For internal linking, trampolines are always created for long calls.
659669
// For external linking, the linker can insert a call stub to handle a long call, but depends on having the TOC address in
660670
// r2. For those build modes with external linking where the TOC address is not maintained in r2, trampolines must be created.
661-
if ctxt.IsExternal() && (ctxt.DynlinkingGo() || ctxt.BuildMode == ld.BuildModeCArchive || ctxt.BuildMode == ld.BuildModeCShared || ctxt.BuildMode == ld.BuildModePIE) {
671+
if ctxt.IsExternal() && r2Valid(ctxt) {
662672
// No trampolines needed since r2 contains the TOC
663673
return
664674
}
@@ -712,7 +722,7 @@ func trampoline(ctxt *ld.Link, ldr *loader.Loader, ri int, rs, s loader.Sym) {
712722
}
713723
}
714724
if ldr.SymType(tramp) == 0 {
715-
if ctxt.DynlinkingGo() || ctxt.BuildMode == ld.BuildModeCArchive || ctxt.BuildMode == ld.BuildModeCShared || ctxt.BuildMode == ld.BuildModePIE {
725+
if r2Valid(ctxt) {
716726
// Should have returned for above cases
717727
ctxt.Errorf(s, "unexpected trampoline for shared or dynamic linking")
718728
} else {

0 commit comments

Comments
 (0)