From: Paul E. Murphy <murp@ibm.com>
Date: Thu, 8 Jul 2021 21:30:41 +0000 (-0500)
Subject: internal/buildcfg: support GOPPC64=power10
X-Git-Tag: go1.20rc1~1540
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0eb56ca4688caed10c422f1d2d3b364d75970b8c;p=gostls13.git

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 ce152171fd..f8800eef73 100644
--- 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 c38c403006..2398260536 100644
--- 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 ef7c715b7f..3076185bda 100644
--- 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 1cc3d3dcd0..e8553e8500 100644
--- 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')
 }