aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Rhee <jordanrh@microsoft.com>2018-07-24 15:07:01 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2018-08-20 20:41:54 +0000
commit3000795c83336b83608a8104fdb2a4643b43e941 (patch)
tree7342719d27cd13727d507f65c9b1783ac78a4d06
parentc589b9ec4eaf47e9e4994113d88e073cb695181b (diff)
downloadgo-3000795c83336b83608a8104fdb2a4643b43e941.tar.gz
go-3000795c83336b83608a8104fdb2a4643b43e941.zip
cmd/dist: support windows/arm
Updates #26148 Change-Id: I4744ebcc77fda3acc1301a1d8857754c0ee797fa Reviewed-on: https://go-review.googlesource.com/130056 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--src/cmd/dist/build.go1
-rw-r--r--src/cmd/dist/sys_windows.go3
2 files changed, 4 insertions, 0 deletions
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")
}