1
0
mirror of https://github.com/golang/go synced 2024-11-17 15:04:45 -07:00

[dev.link] cmd/oldlink: update with recent changes

Update the old linker to bring in recent changes made on the
master branch: CL 225397 and CL 220917.

This brings cmd/oldlink to be in sync with commit
aa4d92b8aa.

Change-Id: Ic386736fa30944dcb71c57096915381d3e6be82c
Reviewed-on: https://go-review.googlesource.com/c/go/+/227028
Run-TryBot: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Cherry Zhang 2020-04-02 14:20:23 -04:00
parent 6b6eb23041
commit 6435590182
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ package arm64
const ( const (
maxAlign = 32 // max data alignment maxAlign = 32 // max data alignment
minAlign = 1 // min data alignment minAlign = 1 // min data alignment
funcAlign = 8 funcAlign = 16
) )
/* Used by ../internal/ld/dwarf.go */ /* Used by ../internal/ld/dwarf.go */

View File

@ -136,7 +136,7 @@ func (ctxt *Link) ErrorUnresolved(s *sym.Symbol, r *sym.Reloc) {
if v == -1 { if v == -1 {
continue continue
} }
if rs := ctxt.Syms.ROLookup(r.Sym.Name, v); rs != nil && rs.Type != sym.Sxxx { if rs := ctxt.Syms.ROLookup(r.Sym.Name, v); rs != nil && rs.Type != sym.Sxxx && rs.Type != sym.SXREF {
haveABI = abi haveABI = abi
} }
} }