cmd/internal/obj: remove unused GOROOT-related fields

Change-Id: I6634f70d6bd1a4eced47eda69a2d9b207d222a1b
Reviewed-on: https://go-review.googlesource.com/29470
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index 3b51390a587702a5225f44ed6560b8f55fc738d5..e9b020c561294012e6c2f222cb09289c2481b3e9 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -673,8 +673,6 @@ type Link struct {
        Flag_optimize bool
        Bso           *bufio.Writer
        Pathname      string
-       Goroot        string
-       Goroot_final  string
        Hash          map[SymVer]*LSym
        LineHist      LineHist
        Imports       []string

diff --git a/src/cmd/internal/obj/obj.go b/src/cmd/internal/obj/obj.go
index 3eb37b3bbc28957348a40c48528a20f8738cee49..566263d3d716583a6ee3f6cb82f8990922a0d7e7 100644 (file)
--- a/src/cmd/internal/obj/obj.go
+++ b/src/cmd/internal/obj/obj.go
@@ -31,7 +31,6 @@ type LineHist struct {
        TrimPathPrefix    string      // remove leading TrimPath from recorded file names
        PrintFilenameOnly bool        // ignore path when pretty-printing a line; internal use only
        GOROOT            string      // current GOROOT
-       GOROOT_FINAL      string      // target GOROOT
 }
 
 // A LineStack is an entry in the recorded line history.

diff --git a/src/cmd/internal/obj/sym.go b/src/cmd/internal/obj/sym.go
index c2ddf6b28319d421a17f2f6b80922bad5a7cf3aa..84de5b61c4da68de2e2a75299ed795263daac474 100644 (file)
--- a/src/cmd/internal/obj/sym.go
+++ b/src/cmd/internal/obj/sym.go
@@ -42,8 +42,6 @@ func Linknew(arch *LinkArch) *Link {
        ctxt.Hash = make(map[SymVer]*LSym)
        ctxt.Arch = arch
        ctxt.Version = HistVersion
-       ctxt.Goroot = GOROOT
-       ctxt.Goroot_final = os.Getenv("GOROOT_FINAL")
 
        var buf string
        buf, _ = os.Getwd()
@@ -54,7 +52,6 @@ func Linknew(arch *LinkArch) *Link {
        ctxt.Pathname = buf
 
        ctxt.LineHist.GOROOT = GOROOT
-       ctxt.LineHist.GOROOT_FINAL = ctxt.Goroot_final
        ctxt.LineHist.Dir = ctxt.Pathname
 
        ctxt.Headtype.Set(GOOS)