Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Joel Sing 2020-10-30 04:32:18 +11:00
parent 3a819e8998
commit 2e6f50020c
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/compile/internal/gc/main.go
View file

@ -130,7 +130,7 @@ func hidePanic() {
// supportsDynlink reports whether or not the code generator for the given // supportsDynlink reports whether or not the code generator for the given
// architecture supports the -shared and -dynlink flags. // architecture supports the -shared and -dynlink flags.
func supportsDynlink(arch *sys.Arch) bool { 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 // timing data for compiler phases

8
src/cmd/dist/test.go vendored
View file

@ -984,7 +984,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
switch pair { switch pair {
case "aix-ppc64", case "aix-ppc64",
"darwin-amd64", "darwin-arm64", "ios-arm64", "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", "freebsd-amd64",
"windows-amd64", "windows-386": "windows-amd64", "windows-386":
return true return true
@ -992,7 +992,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
return false return false
case "c-shared": case "c-shared":
switch pair { 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", "darwin-amd64", "darwin-arm64",
"freebsd-amd64", "freebsd-amd64",
"android-arm", "android-arm64", "android-386", "android-arm", "android-arm64", "android-386",
@ -1002,7 +1002,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
return false return false
case "shared": case "shared":
switch pair { 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 true
} }
return false return false
@ -1021,7 +1021,7 @@ func (t *tester) supportedBuildmode(mode string) bool {
case "pie": case "pie":
switch pair { switch pair {
case "aix/ppc64", 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": "android-amd64", "android-arm", "android-arm64", "android-386":
return true return true
case "darwin-amd64", "darwin-arm64": case "darwin-amd64", "darwin-arm64":

2
src/cmd/go/go_test.go
View file

@ -2021,7 +2021,7 @@ func TestBuildmodePIE(t *testing.T) {
platform := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH) platform := fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
switch platform { 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", "android/amd64", "android/arm", "android/arm64", "android/386",
"freebsd/amd64", "freebsd/amd64",
"windows/386", "windows/amd64", "windows/arm": "windows/386", "windows/amd64", "windows/arm":

6
src/cmd/internal/sys/supported.go
View file

@ -67,7 +67,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
case "c-shared": case "c-shared":
switch platform { 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", "android/amd64", "android/arm", "android/arm64", "android/386",
"freebsd/amd64", "freebsd/amd64",
"darwin/amd64", "darwin/arm64", "darwin/amd64", "darwin/arm64",
@ -84,7 +84,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
case "pie": case "pie":
switch platform { 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", "android/amd64", "android/arm", "android/arm64", "android/386",
"freebsd/amd64", "freebsd/amd64",
"darwin/amd64", "darwin/arm64", "darwin/amd64", "darwin/arm64",
@ -97,7 +97,7 @@ func BuildModeSupported(compiler, buildmode, goos, goarch string) bool {
case "shared": case "shared":
switch platform { 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 true
} }
return false return false