cmd/dist: handle arm64 as a machine hardware name

OpenBSD/arm64 reports itself as arm64 from `uname -m` - this currently
matches as gohostarch=arm, rather than gohostarch=arm64. Correct this
by matching on both aarch64 and arm64 (the alternative would be to use
`uname -p`, however that's likely to cause upset elsewhere).

Updates #31656

Change-Id: I7b2da93495d808e704caf032b3fadc984077769e
Reviewed-on: https://go-review.googlesource.com/c/go/+/173598
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go
index ed116e22f6af6e814a826a9abdb8cb2595617b83..55d5be3e4354a28ffeb21a516ed4930541b105cf 100644 (file)
--- a/src/cmd/dist/main.go
+++ b/src/cmd/dist/main.go
@@ -103,10 +103,10 @@ func main() {
                        gohostarch = "amd64"
                case strings.Contains(out, "86"):
                        gohostarch = "386"
+               case strings.Contains(out, "aarch64"), strings.Contains(out, "arm64"):
+                       gohostarch = "arm64"
                case strings.Contains(out, "arm"):
                        gohostarch = "arm"
-               case strings.Contains(out, "aarch64"):
-                       gohostarch = "arm64"
                case strings.Contains(out, "ppc64le"):
                        gohostarch = "ppc64le"
                case strings.Contains(out, "ppc64"):