From: Jordan Rhee <jordanrh@microsoft.com>
Date: Tue, 24 Jul 2018 22:07:01 +0000 (-0700)
Subject: cmd/dist: support windows/arm
X-Git-Tag: go1.12beta1~1436
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=def3280eb4e4bc7fb058f98fa2993cb077db3f95;p=gostls13.git

cmd/dist: support windows/arm

Updates #26148

Change-Id: I407481f9c0f8e3565dcfcbbc53e5aa7427d74680
Reviewed-on: https://go-review.googlesource.com/125646
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index eed9866ce4..06adccd9a4 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1422,6 +1422,7 @@ var cgoEnabled = map[string]bool{
 	"solaris/amd64":   true,
 	"windows/386":     true,
 	"windows/amd64":   true,
+	"windows/arm":     false,
 }
 
 func needCC() bool {
diff --git a/src/cmd/dist/sys_windows.go b/src/cmd/dist/sys_windows.go
index 216dc01798..2f6a1b0dce 100644
--- a/src/cmd/dist/sys_windows.go
+++ b/src/cmd/dist/sys_windows.go
@@ -32,6 +32,7 @@ type systeminfo struct {
 const (
 	PROCESSOR_ARCHITECTURE_AMD64 = 9
 	PROCESSOR_ARCHITECTURE_INTEL = 0
+	PROCESSOR_ARCHITECTURE_ARM   = 5
 )
 
 var sysinfo systeminfo
@@ -43,6 +44,8 @@ func sysinit() {
 		gohostarch = "amd64"
 	case PROCESSOR_ARCHITECTURE_INTEL:
 		gohostarch = "386"
+	case PROCESSOR_ARCHITECTURE_ARM:
+		gohostarch = "arm"
 	default:
 		fatalf("unknown processor architecture")
 	}