From: Shenghou Ma <minux@golang.org>
Date: Thu, 10 Jul 2014 19:15:24 +0000 (-0400)
Subject: cmd/dist: always use GOARM=7 for nacl/arm
X-Git-Tag: go1.4beta1~1118
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=366f88f3e4449c609f3a5310c79536cfcd22f5c2;p=gostls13.git

cmd/dist: always use GOARM=7 for nacl/arm

LGTM=dave, rsc
R=rsc, iant, dave
CC=golang-codereviews
https://golang.org/cl/101590044
---

diff --git a/src/cmd/dist/arm.c b/src/cmd/dist/arm.c
index 52a621c5dd..1ce7b7710d 100644
--- a/src/cmd/dist/arm.c
+++ b/src/cmd/dist/arm.c
@@ -21,7 +21,8 @@ xgetgoarm(void)
 	// FreeBSD has broken VFP support
 	return "5";
 #endif
-	if(xtryexecfunc(useVFPv3))
+	// NaCl always has VFP support.
+	if(streq(goos, "nacl") || xtryexecfunc(useVFPv3))
 		return "7";
 	else if(xtryexecfunc(useVFPv1))
 		return "6";