cmd/dist: add support for GOARCH=mips{,le}

Change-Id: I6e24d22eada190e9aa2adc161be7a753c8e5054b
Reviewed-on: https://go-review.googlesource.com/31514
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>

diff --git a/src/cmd/compile/main.go b/src/cmd/compile/main.go
index 4376eda6a99f3e0494d8d0bcd34696fcc5208e07..c3c0b6a0681798e773506f86047aaf915873eba6 100644 (file)
--- a/src/cmd/compile/main.go
+++ b/src/cmd/compile/main.go
@@ -9,6 +9,7 @@ import (
        "cmd/compile/internal/arm"
        "cmd/compile/internal/arm64"
        "cmd/compile/internal/gc"
+       "cmd/compile/internal/mips"
        "cmd/compile/internal/mips64"
        "cmd/compile/internal/ppc64"
        "cmd/compile/internal/s390x"
@@ -36,6 +37,8 @@ func main() {
                arm.Init()
        case "arm64":
                arm64.Init()
+       case "mips", "mipsle":
+               mips.Init()
        case "mips64", "mips64le":
                mips64.Init()
        case "ppc64", "ppc64le":

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 7a132f0d5e26ce7bdf887258dadbe8266df4535b..6fb788456024c863ce8e3cc800567633637b897d 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1107,6 +1107,8 @@ var cgoEnabled = map[string]bool{
        "linux/arm64":     true,
        "linux/ppc64":     false,
        "linux/ppc64le":   true,
+       "linux/mips":      false,
+       "linux/mipsle":    false,
        "linux/mips64":    true,
        "linux/mips64le":  true,
        "linux/s390x":     true,

diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index d5ca804306a99c3258510624f0cd8c3a0f58ffaa..b0b9b2579dbb925c0c772ff2c3357df322b4ca65 100644 (file)
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -37,6 +37,7 @@ var bootstrapDirs = []string{
        "cmd/compile/internal/arm",
        "cmd/compile/internal/arm64",
        "cmd/compile/internal/gc",
+       "cmd/compile/internal/mips",
        "cmd/compile/internal/mips64",
        "cmd/compile/internal/ppc64",
        "cmd/compile/internal/s390x",
@@ -59,6 +60,7 @@ var bootstrapDirs = []string{
        "cmd/link/internal/arm",
        "cmd/link/internal/arm64",
        "cmd/link/internal/ld",
+       "cmd/link/internal/mips",
        "cmd/link/internal/mips64",
        "cmd/link/internal/ppc64",
        "cmd/link/internal/s390x",

diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go
index bbf3b75b5b24fb04fbf5b9d5d04f84e8f90736cc..e2f22dfe44000de9f2a632850cf6cfa3615876de 100644 (file)
--- a/src/cmd/dist/util.go
+++ b/src/cmd/dist/util.go
@@ -445,6 +445,11 @@ func main() {
                        if elfIsLittleEndian(os.Args[0]) {
                                gohostarch = "mips64le"
                        }
+               case strings.Contains(out, "mips"):
+                       gohostarch = "mips"
+                       if elfIsLittleEndian(os.Args[0]) {
+                               gohostarch = "mipsle"
+                       }
                case strings.Contains(out, "s390x"):
                        gohostarch = "s390x"
                case gohostos == "darwin":

diff --git a/src/cmd/link/main.go b/src/cmd/link/main.go
index 74357d5853a1729281090ae801a4813870a265c1..a9aeb1e6bb971a91f9b1ff0c84e95d9a5c3050a2 100644 (file)
--- a/src/cmd/link/main.go
+++ b/src/cmd/link/main.go
@@ -10,6 +10,7 @@ import (
        "cmd/link/internal/arm"
        "cmd/link/internal/arm64"
        "cmd/link/internal/ld"
+       "cmd/link/internal/mips"
        "cmd/link/internal/mips64"
        "cmd/link/internal/ppc64"
        "cmd/link/internal/s390x"
@@ -45,6 +46,8 @@ func main() {
                arm.Init()
        case "arm64":
                arm64.Init()
+       case "mips", "mipsle":
+               mips.Init()
        case "mips64", "mips64le":
                mips64.Init()
        case "ppc64", "ppc64le":