diff options
| author | Than McIntosh <thanm@google.com> | 2023-09-29 14:19:17 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-10-12 22:36:36 +0000 |
| commit | 236c07c0496786586f72e2a96ed15003f71ff975 (patch) | |
| tree | a30eea17fabeee8b30d36bfe7c782fb3df7300b3 | |
| parent | 9465990e0e6e773a855dfffadc74be74f14472c4 (diff) | |
| download | go-236c07c0496786586f72e2a96ed15003f71ff975.tar.gz go-236c07c0496786586f72e2a96ed15003f71ff975.zip | |
[release-branch.go1.21] cmd/link: split text sections for arm 32-bit
This CL is a roll-forward (tweaked slightly) of CL 467715, which
turned on text section splitting for GOARCH=arm. The intent is to
avoid recurrent problems with external linking where there is a
disagreement between the Go linker and the external linker over
whether a given branch will reach. In the past our approach has been
to tweak the reachability calculations slightly to try to work around
potential linker problems, but this hasn't proven to be very robust;
section splitting seems to offer a better long term fix.
Updates #58425.
Fixes #63317.
Change-Id: I7372d41abce84097906a3d0805b6b9c486f345d6
Reviewed-on: https://go-review.googlesource.com/c/go/+/531795
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Than McIntosh <thanm@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
(cherry picked from commit 1e690409206ff97330b5a91517d453fc5129bab2)
Reviewed-on: https://go-review.googlesource.com/c/go/+/532096
Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
| -rw-r--r-- | src/cmd/link/internal/ld/data.go | 19 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/ld_test.go | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index 21b2e9a9d4..0550f07d5c 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -2599,15 +2599,22 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64 // Return whether we may need to split text sections. // -// On PPC64x whem external linking a text section should not be larger than 2^25 bytes -// due to the size of call target offset field in the bl instruction. Splitting into -// smaller text sections smaller than this limit allows the system linker to modify the long -// calls appropriately. The limit allows for the space needed for tables inserted by the -// linker. +// On PPC64x, when external linking, a text section should not be +// larger than 2^25 bytes due to the size of call target offset field +// in the 'bl' instruction. Splitting into smaller text sections +// smaller than this limit allows the system linker to modify the long +// calls appropriately. The limit allows for the space needed for +// tables inserted by the linker. // // The same applies to Darwin/ARM64, with 2^27 byte threshold. +// +// Similarly for ARM, we split sections (at 2^25 bytes) to avoid +// inconsistencies between the Go linker's reachability calculations +// (e.g. will direct call from X to Y need a trampoline) and similar +// machinery in the external linker; see #58425 for more on the +// history here. func splitTextSections(ctxt *Link) bool { - return (ctxt.IsPPC64() || (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal() + return (ctxt.IsARM() || ctxt.IsPPC64() || (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal() } // On Wasm, we reserve 4096 bytes for zero page, then 8192 bytes for wasm_exec.js diff --git a/src/cmd/link/internal/ld/ld_test.go b/src/cmd/link/internal/ld/ld_test.go index aef880d534..a7a6082f54 100644 --- a/src/cmd/link/internal/ld/ld_test.go +++ b/src/cmd/link/internal/ld/ld_test.go @@ -136,7 +136,7 @@ func TestArchiveBuildInvokeWithExec(t *testing.T) { func TestLargeTextSectionSplitting(t *testing.T) { switch runtime.GOARCH { - case "ppc64", "ppc64le": + case "ppc64", "ppc64le", "arm": case "arm64": if runtime.GOOS == "darwin" { break |