cmd/link: revert CL 467715 in favor of better fix

thanm · thanm · commit e153905a7bc5 · 2023-02-27T17:37:29.000Z
This patch backs out CL 467715 (written to fix 58425), now that we have a better fix for the "relocation doesn't fit" problem in the trampoline generation phase (send in a previous CL). Updates #58428. Updates #58425. Change-Id: Ib0d966fed00bd04db7ed85aa4e9132382b979a44 Reviewed-on: https://go-review.googlesource.com/c/go/+/471596 Run-TryBot: Than McIntosh <thanm@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Cherry Mui <cherryyz@google.com>
diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
@@ -2536,7 +2536,7 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64
 //
 // The same applies to Darwin/ARM64, with 2^27 byte threshold.
 func splitTextSections(ctxt *Link) bool {
-	return (ctxt.IsARM() || ctxt.IsPPC64() || (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal()
+	return (ctxt.IsPPC64() || (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal()
 }
 
 // On Wasm, we reserve 4096 bytes for zero page, then 8192 bytes for wasm_exec.js

Original file line number	Diff line number	Diff line change
`@@ -2536,7 +2536,7 @@ func assignAddress(ctxt Link, sect sym.Section, n int, s loader.Sym, va uint64`
`2536`	`2536`	`//`
`2537`	`2537`	`// The same applies to Darwin/ARM64, with 2^27 byte threshold.`
`2538`	`2538`	`func splitTextSections(ctxt *Link) bool {`
`2539`		`- return (ctxt.IsARM() \|\| ctxt.IsPPC64() \|\| (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal()`
	`2539`	`+ return (ctxt.IsPPC64() \|\| (ctxt.IsARM64() && ctxt.IsDarwin())) && ctxt.IsExternal()`
`2540`	`2540`	`}`
`2541`	`2541`
`2542`	`2542`	`// On Wasm, we reserve 4096 bytes for zero page, then 8192 bytes for wasm_exec.js`