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 52a621c5dd38249bb7da096367979d40b32a8459..1ce7b7710d90e6c40ae9a29cbca8cca468eabb79 100644 (file)
--- 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";