cmd/internal/ld: change string vars into constants where possible

Change-Id: Ib3d7928bbdba9358e68a326a53effe483ec208ea
Reviewed-on: https://go-review.googlesource.com/7061
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/internal/ld/ar.go b/src/cmd/internal/ld/ar.go
index c464a623f623bc997281272c114f3d5f2f9ae5f1..0e59016edbab9085da48c2ecf8efa3554d353324 100644 (file)
--- a/src/cmd/internal/ld/ar.go
+++ b/src/cmd/internal/ld/ar.go
@@ -36,9 +36,10 @@ const (
        SAR_HDR = 16 + 44
 )
 
-var ARMAG string = "!<arch>\n"
-
-var ARFMAG string = "`\n"
+const (
+       ARMAG  = "!<arch>\n"
+       ARFMAG = "`\n"
+)
 
 type ArHdr struct {
        name string

diff --git a/src/cmd/internal/ld/lib.go b/src/cmd/internal/ld/lib.go
index 282245458ba7042941f6c5fa5bef9ad5d062d2fa..788f64810821c71daebfb59c56bf8c18e5556073 100644 (file)
--- a/src/cmd/internal/ld/lib.go
+++ b/src/cmd/internal/ld/lib.go
@@ -258,9 +258,10 @@ const (
        AssumeGoldLinker = 0
 )
 
-var symname string = "__.GOSYMDEF"
-
-var pkgname string = "__.PKGDEF"
+const (
+       symname = "__.GOSYMDEF"
+       pkgname = "__.PKGDEF"
+)
 
 var cout *os.File
 

diff --git a/src/cmd/internal/ld/objfile.go b/src/cmd/internal/ld/objfile.go
index 5d0eb0257b21e95dd07b25c13804719cbe49f83b..34176bee6e9fe0779ce8dd47f9efc0be59c19607 100644 (file)
--- a/src/cmd/internal/ld/objfile.go
+++ b/src/cmd/internal/ld/objfile.go
@@ -12,9 +12,10 @@ import (
        "strings"
 )
 
-var startmagic string = "\x00\x00go13ld"
-
-var endmagic string = "\xff\xffgo13ld"
+const (
+       startmagic = "\x00\x00go13ld"
+       endmagic   = "\xff\xffgo13ld"
+)
 
 func ldobjfile(ctxt *Link, f *Biobuf, pkg string, length int64, pn string) {
        start := Boffset(f)

diff --git a/src/cmd/internal/ld/pobj.go b/src/cmd/internal/ld/pobj.go
index 226ccf1c192d0edc11eb445e515c52f84a08657c..a161a456d26ba249f783c169fc26bf6693a8315c 100644 (file)
--- a/src/cmd/internal/ld/pobj.go
+++ b/src/cmd/internal/ld/pobj.go
@@ -40,7 +40,7 @@ import (
 
 // Reading object files.
 
-var noname string = "<none>"
+const noname = "<none>"
 
 var paramspace string = "FP"