From 6435590182bb06f12c5caae749855390a981a37f Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Thu, 2 Apr 2020 14:20:23 -0400 Subject: [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 aa4d92b8aab63c847ab077417b809694a2a6ea81. Change-Id: Ic386736fa30944dcb71c57096915381d3e6be82c Reviewed-on: https://go-review.googlesource.com/c/go/+/227028 Run-TryBot: Cherry Zhang Reviewed-by: Jeremy Faller Reviewed-by: Than McIntosh TryBot-Result: Gobot Gobot --- src/cmd/oldlink/internal/arm64/l.go | 2 +- src/cmd/oldlink/internal/ld/link.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/oldlink/internal/arm64/l.go b/src/cmd/oldlink/internal/arm64/l.go index 50b88e479f..5f3530335e 100644 --- a/src/cmd/oldlink/internal/arm64/l.go +++ b/src/cmd/oldlink/internal/arm64/l.go @@ -64,7 +64,7 @@ package arm64 const ( maxAlign = 32 // max data alignment minAlign = 1 // min data alignment - funcAlign = 8 + funcAlign = 16 ) /* Used by ../internal/ld/dwarf.go */ diff --git a/src/cmd/oldlink/internal/ld/link.go b/src/cmd/oldlink/internal/ld/link.go index 4020f8dbc4..15878f3267 100644 --- a/src/cmd/oldlink/internal/ld/link.go +++ b/src/cmd/oldlink/internal/ld/link.go @@ -136,7 +136,7 @@ func (ctxt *Link) ErrorUnresolved(s *sym.Symbol, r *sym.Reloc) { if v == -1 { 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 } } -- cgit v1.2.3-54-g00ecf