internal/buildcfg: support GOPPC64=power10

This does not enable any new functionality. It should
behave identically to GOPPC64=power9.

Updates #44549

Change-Id: I9a860544527fcfe97cbaf89686459d40dcf9593e
Reviewed-on: https://go-review.googlesource.com/c/go/+/352791
Run-TryBot: Paul Murphy <murp@ibm.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Lynn Boger <laboger@linux.vnet.ibm.com>

diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index ce152171fda2ed32c8156bc4ded57bf558ee6542..f8800eef732e9dd47d711340d2acaa516cbec775 100644 (file)
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -2171,7 +2171,7 @@
 //             Valid values are hardfloat (default), softfloat.
 //     GOPPC64
 //             For GOARCH=ppc64{,le}, the target ISA (Instruction Set Architecture).
-//             Valid values are power8 (default), power9.
+//             Valid values are power8 (default), power9, power10.
 //     GOWASM
 //             For GOARCH=wasm, comma-separated list of experimental WebAssembly features to use.
 //             Valid values are satconv, signext.

diff --git a/src/cmd/go/internal/help/helpdoc.go b/src/cmd/go/internal/help/helpdoc.go
index c38c4030068dcc2d4f4764d89250ee71ccb88561..2398260536c0731fb2f10e81548eee88577dc8b6 100644 (file)
--- a/src/cmd/go/internal/help/helpdoc.go
+++ b/src/cmd/go/internal/help/helpdoc.go
@@ -614,7 +614,7 @@ Architecture-specific environment variables:
                Valid values are hardfloat (default), softfloat.
        GOPPC64
                For GOARCH=ppc64{,le}, the target ISA (Instruction Set Architecture).
-               Valid values are power8 (default), power9.
+               Valid values are power8 (default), power9, power10.
        GOWASM
                For GOARCH=wasm, comma-separated list of experimental WebAssembly features to use.
                Valid values are satconv, signext.

diff --git a/src/cmd/go/testdata/script/tooltags.txt b/src/cmd/go/testdata/script/tooltags.txt
index ef7c715b7f13446bb091210995594515beea6025..3076185bda728e8cd961c8b08450fc53e5da2dc9 100644 (file)
--- a/src/cmd/go/testdata/script/tooltags.txt
+++ b/src/cmd/go/testdata/script/tooltags.txt
@@ -23,11 +23,21 @@ env GOPPC64=power9
 go list -f '{{context.ToolTags}}'
 stdout 'ppc64.power8 ppc64.power9'
 
+env GOARCH=ppc64
+env GOPPC64=power10
+go list -f '{{context.ToolTags}}'
+stdout 'ppc64.power8 ppc64.power9 ppc64.power10'
+
 env GOARCH=ppc64le
 env GOPPC64=power9
 go list -f '{{context.ToolTags}}'
 stdout 'ppc64le.power8 ppc64le.power9'
 
+env GOARCH=ppc64le
+env GOPPC64=power10
+go list -f '{{context.ToolTags}}'
+stdout 'ppc64le.power8 ppc64le.power9 ppc64le.power10'
+
 env GOARCH=386
 env GO386=sse2
 go list -f '{{context.ToolTags}}'

diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go
index 1cc3d3dcd0bca0fd51e051e3d73a9e53c961fbbb..e8553e85008231fde04e5f7ba6d89d2582ba24a7 100644 (file)
--- a/src/internal/buildcfg/cfg.go
+++ b/src/internal/buildcfg/cfg.go
@@ -110,8 +110,10 @@ func goppc64() int {
                return 8
        case "power9":
                return 9
+       case "power10":
+               return 10
        }
-       Error = fmt.Errorf("invalid GOPPC64: must be power8, power9")
+       Error = fmt.Errorf("invalid GOPPC64: must be power8, power9, power10")
        return int(defaultGOPPC64[len("power")] - '0')
 }