cmd/compile/internal/gc: remove Thearch.Linkarchinit

Change-Id: I8e990204c7a1e65d6b8e4262f6b5b9bd0cb3540c
Reviewed-on: https://go-review.googlesource.com/20725
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/compile/internal/amd64/galign.go b/src/cmd/compile/internal/amd64/galign.go
index 5350608594ca52710f5fa993323e158fd8f33d69..14721ea35b847f2b6be17ba4dd670d0d1922f09c 100644 (file)
--- a/src/cmd/compile/internal/amd64/galign.go
+++ b/src/cmd/compile/internal/amd64/galign.go
@@ -11,23 +11,12 @@ import (
 )
 
 var (
-       thestring   = "amd64"
-       thelinkarch = &x86.Linkamd64
-       addptr      = x86.AADDQ
-       movptr      = x86.AMOVQ
-       leaptr      = x86.ALEAQ
-       cmpptr      = x86.ACMPQ
+       addptr = x86.AADDQ
+       movptr = x86.AMOVQ
+       leaptr = x86.ALEAQ
+       cmpptr = x86.ACMPQ
 )
 
-func linkarchinit() {
-       if obj.Getgoarch() == "amd64p32" {
-               thelinkarch = &x86.Linkamd64p32
-               gc.Thearch.Thelinkarch = thelinkarch
-               thestring = "amd64p32"
-               gc.Thearch.Thestring = "amd64p32"
-       }
-}
-
 func betypeinit() {
        gc.Widthptr = 8
        gc.Widthint = 8
@@ -54,8 +43,12 @@ func Main() {
        }
 
        gc.Thearch.Thechar = '6'
-       gc.Thearch.Thestring = thestring
-       gc.Thearch.Thelinkarch = thelinkarch
+       gc.Thearch.Thestring = "amd64"
+       gc.Thearch.Thelinkarch = &x86.Linkamd64
+       if obj.Getgoarch() == "amd64p32" {
+               gc.Thearch.Thestring = "amd64p32"
+               gc.Thearch.Thelinkarch = &x86.Linkamd64p32
+       }
        gc.Thearch.REGSP = x86.REGSP
        gc.Thearch.REGCTXT = x86.REGCTXT
        gc.Thearch.REGCALLX = x86.REG_BX
@@ -85,7 +78,6 @@ func Main() {
        gc.Thearch.Ginscon = ginscon
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp

diff --git a/src/cmd/compile/internal/arm/galign.go b/src/cmd/compile/internal/arm/galign.go
index b431dc40ab4311b5c80d1c001aaef134756c34f3..d89b852d7f25941e2a94113f10ad04b1d435c9e2 100644 (file)
--- a/src/cmd/compile/internal/arm/galign.go
+++ b/src/cmd/compile/internal/arm/galign.go
@@ -9,9 +9,6 @@ import (
        "cmd/internal/obj/arm"
 )
 
-func linkarchinit() {
-}
-
 func betypeinit() {
        gc.Widthptr = 4
        gc.Widthint = 4
@@ -50,7 +47,6 @@ func Main() {
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
        gc.Thearch.Cgenindex = cgenindex
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp

diff --git a/src/cmd/compile/internal/arm64/galign.go b/src/cmd/compile/internal/arm64/galign.go
index 1e7eadbdd4df8c8a3b22e4222baa7ff2604f2bbd..7e1226fee1ef5d9c90709d3096e0ad4cb7260fb0 100644 (file)
--- a/src/cmd/compile/internal/arm64/galign.go
+++ b/src/cmd/compile/internal/arm64/galign.go
@@ -9,9 +9,6 @@ import (
        "cmd/internal/obj/arm64"
 )
 
-func linkarchinit() {
-}
-
 func betypeinit() {
        gc.Widthptr = 8
        gc.Widthint = 8
@@ -49,7 +46,6 @@ func Main() {
        gc.Thearch.Ginscon = ginscon
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp

diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go
index 5317648ff5535c8bae8963bf613f9634ef337cc7..4473ee6cdfa3161944ef4f3cc1469ce622564641 100644 (file)
--- a/src/cmd/compile/internal/gc/go.go
+++ b/src/cmd/compile/internal/gc/go.go
@@ -543,7 +543,6 @@ type Arch struct {
        Ginsnop      func()
        Gmove        func(*Node, *Node)
        Igenindex    func(*Node, *Node, bool) *obj.Prog
-       Linkarchinit func()
        Peep         func(*obj.Prog)
        Proginfo     func(*obj.Prog) // fills in Prog.Info
        Regtyp       func(*obj.Addr) bool

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 5422879e07c95e29e904282f442ad44487230b05..f4396d13e2b64143dfe7e401348ce9449f208425 100644 (file)
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -98,7 +98,6 @@ func Main() {
        }
        goarch = p
 
-       Thearch.Linkarchinit()
        Ctxt = obj.Linknew(Thearch.Thelinkarch)
        Ctxt.DiagFunc = Yyerror
        Ctxt.Bso = &bstdout

diff --git a/src/cmd/compile/internal/mips64/galign.go b/src/cmd/compile/internal/mips64/galign.go
index e1ad0bfe1d7ba610f4eb408a3e28e3f3401e6587..9d582f4b5132193276d98457143bac6c59ff4f79 100644 (file)
--- a/src/cmd/compile/internal/mips64/galign.go
+++ b/src/cmd/compile/internal/mips64/galign.go
@@ -10,22 +10,6 @@ import (
        "cmd/internal/obj/mips"
 )
 
-var (
-       thestring   = "mips64"
-       thelinkarch *obj.LinkArch
-)
-
-func linkarchinit() {
-       thestring = obj.Getgoarch()
-       gc.Thearch.Thestring = thestring
-       if thestring == "mips64le" {
-               thelinkarch = &mips.Linkmips64le
-       } else {
-               thelinkarch = &mips.Linkmips64
-       }
-       gc.Thearch.Thelinkarch = thelinkarch
-}
-
 func betypeinit() {
        gc.Widthptr = 8
        gc.Widthint = 8
@@ -34,8 +18,12 @@ func betypeinit() {
 
 func Main() {
        gc.Thearch.Thechar = '0'
-       gc.Thearch.Thestring = thestring
-       gc.Thearch.Thelinkarch = thelinkarch
+       gc.Thearch.Thestring = "mips64"
+       gc.Thearch.Thelinkarch = &mips.Linkmips64
+       if obj.Getgoarch() == "mips64le" {
+               gc.Thearch.Thestring = "mips64le"
+               gc.Thearch.Thelinkarch = &mips.Linkmips64le
+       }
        gc.Thearch.REGSP = mips.REGSP
        gc.Thearch.REGCTXT = mips.REGCTXT
        gc.Thearch.REGCALLX = mips.REG_R1
@@ -62,7 +50,6 @@ func Main() {
        gc.Thearch.Ginscon = ginscon
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp

diff --git a/src/cmd/compile/internal/ppc64/galign.go b/src/cmd/compile/internal/ppc64/galign.go
index 03b93fd2358d6f32d7197514dd2575de5f47dd5c..91bece6080a6e896dc9e5aa7ed8c535864e38a49 100644 (file)
--- a/src/cmd/compile/internal/ppc64/galign.go
+++ b/src/cmd/compile/internal/ppc64/galign.go
@@ -10,22 +10,6 @@ import (
        "cmd/internal/obj/ppc64"
 )
 
-var (
-       thestring   = "ppc64"
-       thelinkarch *obj.LinkArch
-)
-
-func linkarchinit() {
-       thestring = obj.Getgoarch()
-       gc.Thearch.Thestring = thestring
-       if thestring == "ppc64le" {
-               thelinkarch = &ppc64.Linkppc64le
-       } else {
-               thelinkarch = &ppc64.Linkppc64
-       }
-       gc.Thearch.Thelinkarch = thelinkarch
-}
-
 func betypeinit() {
        gc.Widthptr = 8
        gc.Widthint = 8
@@ -39,8 +23,12 @@ func betypeinit() {
 
 func Main() {
        gc.Thearch.Thechar = '9'
-       gc.Thearch.Thestring = thestring
-       gc.Thearch.Thelinkarch = thelinkarch
+       gc.Thearch.Thestring = "ppc64"
+       gc.Thearch.Thelinkarch = &ppc64.Linkppc64
+       if obj.Getgoarch() == "ppc64le" {
+               gc.Thearch.Thestring = "ppc64le"
+               gc.Thearch.Thelinkarch = &ppc64.Linkppc64le
+       }
        gc.Thearch.REGSP = ppc64.REGSP
        gc.Thearch.REGCTXT = ppc64.REGCTXT
        gc.Thearch.REGCALLX = ppc64.REG_R3
@@ -67,7 +55,6 @@ func Main() {
        gc.Thearch.Ginscon = ginscon
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp

diff --git a/src/cmd/compile/internal/x86/galign.go b/src/cmd/compile/internal/x86/galign.go
index 9e30502ec4d7c22bf592b1788f545c88b2952a22..4ab72b6da77d3614638ac8bec4b397e6c322aefb 100644 (file)
--- a/src/cmd/compile/internal/x86/galign.go
+++ b/src/cmd/compile/internal/x86/galign.go
@@ -12,9 +12,6 @@ import (
        "os"
 )
 
-func linkarchinit() {
-}
-
 func betypeinit() {
        gc.Widthptr = 4
        gc.Widthint = 4
@@ -67,7 +64,6 @@ func Main() {
        gc.Thearch.Ginsnop = ginsnop
        gc.Thearch.Gmove = gmove
        gc.Thearch.Igenindex = igenindex
-       gc.Thearch.Linkarchinit = linkarchinit
        gc.Thearch.Peep = peep
        gc.Thearch.Proginfo = proginfo
        gc.Thearch.Regtyp = regtyp