[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 <cherryyz@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/oldlink/internal/arm64/l.go b/src/cmd/oldlink/internal/arm64/l.go
index 50b88e479fbc20eaa63e33d50cbf5fd81ea32d77..5f3530335ee1fd603f5af6719f5f74e182926a24 100644 (file)
--- 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 4020f8dbc4ce60a76e8bb5e019ffabe79a1a74e3..15878f3267e23736c1131876d2b5a0bb72086eee 100644 (file)
--- 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
                                }
                        }