[dev.link] cmd/link: convert buildinfo pass to new style

Change-Id: I2e1a6d2f1ef7402277c981282556c276ec0585ec
Reviewed-on: https://go-review.googlesource.com/c/go/+/227771
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>

diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index f72262cf4d10e511f830f8402758e8e1f8d6aa51..b7833af78bf00c438d067ed1f0b2ee8ade028c1e 100644 (file)
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -2148,10 +2148,11 @@ func (ctxt *Link) buildinfo() {
                return
        }
 
-       s := ctxt.Syms.Lookup(".go.buildinfo", 0)
-       s.Attr |= sym.AttrReachable
-       s.Type = sym.SBUILDINFO
-       s.Align = 16
+       ldr := ctxt.loader
+       s := ldr.CreateSymForUpdate(".go.buildinfo", 0)
+       s.SetReachable(true)
+       s.SetType(sym.SBUILDINFO)
+       s.SetAlign(16)
        // The \xff is invalid UTF-8, meant to make it less likely
        // to find one of these accidentally.
        const prefix = "\xff Go buildinf:" // 14 bytes, plus 2 data bytes filled in below
@@ -2162,14 +2163,16 @@ func (ctxt *Link) buildinfo() {
        if ctxt.Arch.ByteOrder == binary.BigEndian {
                data[len(prefix)+1] = 1
        }
-       s.P = data
-       s.Size = int64(len(s.P))
-       s1 := ctxt.Syms.Lookup("runtime.buildVersion", 0)
-       s2 := ctxt.Syms.Lookup("runtime.modinfo", 0)
-       s.R = []sym.Reloc{
-               {Off: 16, Siz: uint8(ctxt.Arch.PtrSize), Type: objabi.R_ADDR, Sym: s1},
-               {Off: 16 + int32(ctxt.Arch.PtrSize), Siz: uint8(ctxt.Arch.PtrSize), Type: objabi.R_ADDR, Sym: s2},
-       }
+       s.SetData(data)
+       s.SetSize(int64(len(data)))
+       r, _ := s.AddRel(objabi.R_ADDR)
+       r.SetOff(16)
+       r.SetSiz(uint8(ctxt.Arch.PtrSize))
+       r.SetSym(ldr.LookupOrCreateSym("runtime.buildVersion", 0))
+       r, _ = s.AddRel(objabi.R_ADDR)
+       r.SetOff(16 + int32(ctxt.Arch.PtrSize))
+       r.SetSiz(uint8(ctxt.Arch.PtrSize))
+       r.SetSym(ldr.LookupOrCreateSym("runtime.modinfo", 0))
 }
 
 // assign addresses to text

diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go
index 7f11731ef4dd21f636bdd18d749105d7525bed47..1985f41ff134f997868595289950224590ebc498 100644 (file)
--- a/src/cmd/link/internal/ld/main.go
+++ b/src/cmd/link/internal/ld/main.go
@@ -292,6 +292,8 @@ func Main(arch *sys.Arch, theArch Arch) {
        ctxt.textaddress()
        bench.Start("typelink")
        ctxt.typelink()
+       bench.Start("buildinfo")
+       ctxt.buildinfo()
        bench.Start("loadlibfull")
        ctxt.loadlibfull() // XXX do it here for now
        bench.Start("pclntab")
@@ -300,8 +302,6 @@ func Main(arch *sys.Arch, theArch Arch) {
        ctxt.findfunctab()
        bench.Start("symtab")
        ctxt.symtab()
-       bench.Start("buildinfo")
-       ctxt.buildinfo()
        bench.Start("dodata")
        ctxt.dodata()
        bench.Start("address")