cmd/dist, go/types: add support for GOARCH=riscv64

This is needed in addition to CL 110066 in order to be able to generate
Go type definitions for linux/riscv64 in the golang.org/x/sys/unix
package.

Change-Id: I4a27e6424aaea63283b55bd4f73b958b41f29d72
Reviewed-on: https://go-review.googlesource.com/118618
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index effea903e9de7aa02083c8968ff46868afbf87dd..616e76dfe7fc45da4622e0c17fb5405343f7999c 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -67,6 +67,7 @@ var okgoarch = []string{
        "mips64le",
        "ppc64",
        "ppc64le",
+       "riscv64",
        "s390x",
        "wasm",
 }
@@ -1393,6 +1394,7 @@ var cgoEnabled = map[string]bool{
        "linux/mipsle":    true,
        "linux/mips64":    true,
        "linux/mips64le":  true,
+       "linux/riscv64":   true,
        "linux/s390x":     true,
        "android/386":     true,
        "android/amd64":   true,

diff --git a/src/cmd/vet/all/main.go b/src/cmd/vet/all/main.go
index 6c56daff03b1b5a3d9810f75ae30367989ee575f..4b1df73b54dbb5b2b978a77571bc11051235e59e 100644 (file)
--- a/src/cmd/vet/all/main.go
+++ b/src/cmd/vet/all/main.go
@@ -197,6 +197,11 @@ func (p platform) vet() {
                fmt.Println("skipping js/wasm")
                return
        }
+       if p.os == "linux" && p.arch == "riscv64" {
+               // TODO(tklauser): enable as soon as the riscv64 port has fully landed
+               fmt.Println("skipping linux/riscv64")
+               return
+       }
 
        var buf bytes.Buffer
        fmt.Fprintf(&buf, "go run main.go -p %s\n", p)

diff --git a/src/go/types/sizes.go b/src/go/types/sizes.go
index fda0c954697ed739d003e1d580c4c4d5d7fc9f9e..7b5410167f99bc0304a35f336fd55b226849bf6d 100644 (file)
--- a/src/go/types/sizes.go
+++ b/src/go/types/sizes.go
@@ -167,6 +167,7 @@ var gcArchSizes = map[string]*StdSizes{
        "mips64le": {8, 8},
        "ppc64":    {8, 8},
        "ppc64le":  {8, 8},
+       "riscv64":  {8, 8},
        "s390x":    {8, 8},
        "wasm":     {8, 8},
        // When adding more architectures here,
@@ -178,7 +179,7 @@ var gcArchSizes = map[string]*StdSizes{
 //
 // Supported architectures for compiler "gc":
 // "386", "arm", "arm64", "amd64", "amd64p32", "mips", "mipsle",
-// "mips64", "mips64le", "ppc64", "ppc64le", "s390x", "wasm".
+// "mips64", "mips64le", "ppc64", "ppc64le", "riscv64", "s390x", "wasm".
 func SizesFor(compiler, arch string) Sizes {
        if compiler != "gc" {
                return nil