[dev.link] cmd/link: remove elfsetstring

No longer needed.

Change-Id: I7cd08915e4731c4546414340df69521e2347367f
Reviewed-on: https://go-review.googlesource.com/c/go/+/233521
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/elf.go b/src/cmd/link/internal/ld/elf.go
index b6ef555a6b4ba8642784a4c6a3ad11b0069fbd3e..341ac844691b80893110e9989398f755a540799b 100644 (file)
--- a/src/cmd/link/internal/ld/elf.go
+++ b/src/cmd/link/internal/ld/elf.go
@@ -628,7 +628,7 @@ func elfwriteshdrs(out *OutBuf) uint32 {
        return uint32(ehdr.shnum) * ELF32SHDRSIZE
 }
 
-func elfsetstring2(ctxt *Link, s loader.Sym, str string, off int) {
+func elfsetstring(ctxt *Link, s loader.Sym, str string, off int) {
        if nelfstr >= len(elfstr) {
                ctxt.Errorf(s, "too many elf strings")
                errorexit()

diff --git a/src/cmd/link/internal/ld/elf2.go b/src/cmd/link/internal/ld/elf2.go
deleted file mode 100644 (file)
index c7fab6c..0000000
--- a/src/cmd/link/internal/ld/elf2.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ld
-
-import "cmd/link/internal/sym"
-
-// Temporary dumping around for sym.Symbol version of helper
-// functions in elf.go, still being used for some archs/oses.
-// FIXME: get rid of this file when dodata() is completely
-// converted and the sym.Symbol functions are not needed.
-
-func elfsetstring(s *sym.Symbol, str string, off int) {
-       if nelfstr >= len(elfstr) {
-               Errorf(s, "too many elf strings")
-               errorexit()
-       }
-
-       elfstr[nelfstr].s = str
-       elfstr[nelfstr].off = off
-       nelfstr++
-}

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 34052f1f6b9006ea57379d8d7fdebbf2dba55df6..09b9c18024ecc85728777beffdcdf4944f0a2ec0 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -506,7 +506,8 @@ func (ctxt *Link) loadlib() {
        default:
                log.Fatalf("invalid -strictdups flag value %d", *FlagStrictDups)
        }
-       ctxt.loader = loader.NewLoader(flags, elfsetstring, &ctxt.ErrorReporter.ErrorReporter)
+       elfsetstring1 := func(str string, off int) { elfsetstring(ctxt, 0, str, off) }
+       ctxt.loader = loader.NewLoader(flags, elfsetstring1, &ctxt.ErrorReporter.ErrorReporter)
        ctxt.ErrorReporter.SymName = func(s loader.Sym) string {
                return ctxt.loader.SymName(s)
        }

diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go
index e906ec3d5ecbd780a757f4f5593416102a93528c..7ee5bacb5a9b6eb9eb95fadc5d5e11f46c0a8329 100644 (file)
--- a/src/cmd/link/internal/loader/loader.go
+++ b/src/cmd/link/internal/loader/loader.go
@@ -312,7 +312,7 @@ const (
        nonPkgRef
 )
 
-type elfsetstringFunc func(s *sym.Symbol, str string, off int)
+type elfsetstringFunc func(str string, off int)
 
 // extSymPayload holds the payload (data + relocations) for linker-synthesized
 // external symbols (note that symbol value is stored in a separate slice).

diff --git a/src/cmd/link/internal/loader/loader_test.go b/src/cmd/link/internal/loader/loader_test.go
index 60ef69afb994927f2444585ca4b172bec3bfb6d8..dfaad6e0d247a56cc84cbaecbb12a16dc1040a01 100644 (file)
--- a/src/cmd/link/internal/loader/loader_test.go
+++ b/src/cmd/link/internal/loader/loader_test.go
@@ -28,7 +28,7 @@ func addDummyObjSym(t *testing.T, ldr *Loader, or *oReader, name string) Sym {
 }
 
 func mkLoader() *Loader {
-       edummy := func(s *sym.Symbol, str string, off int) {}
+       edummy := func(str string, off int) {}
        er := ErrorReporter{}
        ldr := NewLoader(0, edummy, &er)
        er.ldr = ldr

diff --git a/src/cmd/link/internal/loader/symbolbuilder.go b/src/cmd/link/internal/loader/symbolbuilder.go
index 70adb369a4066884929cbd6477c2b15cd6060b1b..b84a96d15c58ec89304a627c5bca9b6cfebb3ce9 100644 (file)
--- a/src/cmd/link/internal/loader/symbolbuilder.go
+++ b/src/cmd/link/internal/loader/symbolbuilder.go
@@ -363,7 +363,7 @@ func (sb *SymbolBuilder) Addstring(str string) int64 {
        r := sb.size
        if sb.name == ".shstrtab" {
                // FIXME: find a better mechanism for this
-               sb.l.elfsetstring(nil, str, int(r))
+               sb.l.elfsetstring(str, int(r))
        }
        sb.data = append(sb.data, str...)
        sb.data = append(sb.data, 0)