From: Michael Munday <munday@ca.ibm.com>
Date: Fri, 18 Mar 2016 19:39:25 +0000 (-0400)
Subject: cmd/dist: add "s390x" to okgoarch and cgoEnabled
X-Git-Tag: go1.7beta1~1190
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4fbe96adc3908668ec2ae65696941199b7e117f8;p=gostls13.git

cmd/dist: add "s390x" to okgoarch and cgoEnabled

Allows the compiler to recognise s390x specific files and s390x
build tags.

Change-Id: I7c62ab7361cf708181b1d9cfbe9b1fcb01be31e0
Reviewed-on: https://go-review.googlesource.com/20872
Reviewed-by: Minux Ma <minux@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 2712d25e38..d6dfa2d3e0 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -60,6 +60,7 @@ var okgoarch = []string{
 	"mips64le",
 	"ppc64",
 	"ppc64le",
+	"s390x",
 }
 
 // The known operating systems.
@@ -1097,6 +1098,7 @@ var cgoEnabled = map[string]bool{
 	"linux/ppc64le":   true,
 	"linux/mips64":    false,
 	"linux/mips64le":  false,
+	"linux/s390x":     true,
 	"android/386":     true,
 	"android/amd64":   true,
 	"android/arm":     true,