Revert "cmd/compile,cmd/internal/sys: enable additional build modes on linux/riscv64"

This reverts CL 263457.

It turns out that this still missed changes to cmd/link/internal/ld/config.go
and some of these build modes also fail once cgo is enabled. Disable again for
now.

Change-Id: Iaf40d44e1551afd5b040d357f04af134f55a64a9
Reviewed-on: https://go-review.googlesource.com/c/go/+/266317
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Trust: Joel Sing <joel@sing.id.au>

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 0b65e8a0b46ef181c03fccd79660190955caa8c1..4b401f2aa46eaab05c00b0fc510b899d266dd617 100644 (file)
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -130,7 +130,7 @@ func hidePanic() {
 // supportsDynlink reports whether or not the code generator for the given
 // architecture supports the -shared and -dynlink flags.
 func supportsDynlink(arch *sys.Arch) bool {
-       return arch.InFamily(sys.AMD64, sys.ARM, sys.ARM64, sys.I386, sys.PPC64, sys.RISCV64, sys.S390X)
+       return arch.InFamily(sys.AMD64, sys.ARM, sys.ARM64, sys.I386, sys.PPC64, sys.S390X)
 }
 
 // timing data for compiler phases

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index aeffc2659f9cb3b78e506cba8f51949c87f8b93e..7c454dd38d57a845edd1cdf68fef6c0f6f9d7a86 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -984,7 +984,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
                switch pair {
                case "aix-ppc64",
                        "darwin-amd64", "darwin-arm64", "ios-arm64",
-                       "linux-amd64", "linux-386", "linux-ppc64le", "linux-riscv64", "linux-s390x",
+                       "linux-amd64", "linux-386", "linux-ppc64le", "linux-s390x",
                        "freebsd-amd64",
                        "windows-amd64", "windows-386":
                        return true
@@ -992,7 +992,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
                return false
        case "c-shared":
                switch pair {
-               case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-riscv64", "linux-s390x",
+               case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-s390x",
                        "darwin-amd64", "darwin-arm64",
                        "freebsd-amd64",
                        "android-arm", "android-arm64", "android-386",
@@ -1002,7 +1002,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
                return false
        case "shared":
                switch pair {
-               case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-riscv64", "linux-s390x":
+               case "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-s390x":
                        return true
                }
                return false
@@ -1021,7 +1021,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
        case "pie":
                switch pair {
                case "aix/ppc64",
-                       "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-riscv64", "linux-s390x",
+                       "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-s390x",
                        "android-amd64", "android-arm", "android-arm64", "android-386":
                        return true
                case "darwin-amd64", "darwin-arm64":

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index c7ca73b5b5fee7a8608ad6d73e6a38276e623221..1fb1325519d3d21fabd86e1c3399d2b959a1eb5b 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -2021,7 +2021,7 @@ func TestBuildmodePIE(t *testing.T) {
 
        platform := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
        switch platform {
-       case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x",
+       case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",
                "android/amd64", "android/arm", "android/arm64", "android/386",
                "freebsd/amd64",
                "windows/386", "windows/amd64", "windows/arm":

diff --git a/src/cmd/internal/sys/supported.go b/src/cmd/internal/sys/supported.go
index afc81381fdf08ce3043dc48282523ac5abd4d571..3c750774ed2fdb86c59044f4709c21d796792075 100644 (file)
--- a/src/cmd/internal/sys/supported.go
+++ b/src/cmd/internal/sys/supported.go
@@ -67,7 +67,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
 
        case "c-shared":
                switch platform {
-               case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", "linux/riscv64", "linux/s390x",
+               case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", "linux/s390x",
                        "android/amd64", "android/arm", "android/arm64", "android/386",
                        "freebsd/amd64",
                        "darwin/amd64", "darwin/arm64",
@@ -84,7 +84,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
 
        case "pie":
                switch platform {
-               case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x",
+               case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",
                        "android/amd64", "android/arm", "android/arm64", "android/386",
                        "freebsd/amd64",
                        "darwin/amd64", "darwin/arm64",
@@ -97,7 +97,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
 
        case "shared":
                switch platform {
-               case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/riscv64", "linux/s390x":
+               case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x":
                        return true
                }
                return false