]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.15] cmd/link: don't cast end address to int32
authorCherry Mui <cherryyz@google.com>
Wed, 12 May 2021 02:40:02 +0000 (22:40 -0400)
committerDmitri Shuralyov <dmitshur@golang.org>
Fri, 21 May 2021 22:34:38 +0000 (22:34 +0000)
When linking a very large binary, the section address may not fit
in int32. Don't truncate it.

Fixes #46127.
Updates #46126.

Change-Id: Ibcc8d74bf5662611949e547ce44ca8b973de383f
Reviewed-on: https://go-review.googlesource.com/c/go/+/319289
Trust: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
(cherry picked from commit af0f8c149e8a4b237910fc7b41739bedc546473c)
Reviewed-on: https://go-review.googlesource.com/c/go/+/319370

src/cmd/link/internal/ld/elf.go
src/cmd/link/internal/ld/macho.go

index 78298beafe70b8244217dd102c7865cc76a8857b..36ec4035c3dd3f877f7f039ea189850f8eaae2f9 100644 (file)
@@ -1400,7 +1400,7 @@ func elfrelocsect(ctxt *Link, sect *sym.Section, syms []*sym.Symbol) {
        }
 
        ldr := ctxt.loader
-       eaddr := int32(sect.Vaddr + sect.Length)
+       eaddr := sect.Vaddr + sect.Length
        for _, s := range syms {
                if !s.Attr.Reachable() {
                        continue
index 5548b8c6664c57cd373d7daa2f634de720b10da8..df016f3d437eb81672b1fe2f094bc1d026eea9c1 100644 (file)
@@ -1044,7 +1044,7 @@ func machorelocsect(ctxt *Link, sect *sym.Section, syms []*sym.Symbol) {
                }
        }
 
-       eaddr := int32(sect.Vaddr + sect.Length)
+       eaddr := sect.Vaddr + sect.Length
        for _, s := range syms {
                if !s.Attr.Reachable() {
                        continue