cmd/dist: set GOARM=7 for windows/arm

zx2c4 · rsc · commit 609d82b28992 · 2021-02-18T15:00:59.000Z
GOARM=6 executables fail to launch on windows/arm, so set this to ARMv7 like we do for Android. This CL is part of a stack adding windows/arm64 support (golang#36439), intended to land in the Go 1.17 cycle. Change-Id: Ifa13685e7ab6edd367f3dfec10296e376319dbd4 Reviewed-on: https://go-review.googlesource.com/c/go/+/291629 Reviewed-by: Russ Cox <rsc@golang.org> Trust: Jason A. Donenfeld <Jason@zx2c4.com> Run-TryBot: Jason A. Donenfeld <Jason@zx2c4.com> TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go
@@ -389,6 +389,10 @@ func xgetgoarm() string {
 		// sense to auto-detect the setting.
 		return "7"
 	}
+	if goos == "windows" {
+		// windows/arm only works with ARMv7 executables.
+		return "7"
+	}
 	if gohostarch != "arm" || goos != gohostos {
 		// Conservative default for cross-compilation.
 		return "5"
