build: change GO386=sse to GO386=sse2

sse2 is a more precise description of the requirement,
and it matches what people will see in, for example
        grep sse2 /proc/cpuinfo # linux
        sysctl hw.optional.sse2 # os x

R=golang-dev, dsymonds, iant
CC=golang-dev
https://golang.org/cl/7057050

diff --git a/src/cmd/dist/a.h b/src/cmd/dist/a.h
index 7c6516dab63b35c820f1fe4eab8e15867cb24595..fcd81cc5115ea9ee02f3c6c1a22aaf8790e22b78 100644 (file)
--- a/src/cmd/dist/a.h
+++ b/src/cmd/dist/a.h
@@ -123,7 +123,7 @@ void        runv(Buf *b, char *dir, int mode, Vec *argv);
 void   bgrunv(char *dir, int mode, Vec *argv);
 void   bgwait(void);
 bool   streq(char*, char*);
-bool   cansse(void);
+bool   cansse2(void);
 void   writefile(Buf*, char*, int);
 void   xatexit(void (*f)(void));
 void   xexit(int);

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index e51fc9d7d77b38eaeb0b77dfeb28babbecb19569..e91e9eaecd485447d9eb685957e026a69affb1c6 100644 (file)
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -105,8 +105,8 @@ init(void)
 
        xgetenv(&b, "GO386");
        if(b.len == 0) {
-               if(cansse())
-                       bwritestr(&b, "sse");
+               if(cansse2())
+                       bwritestr(&b, "sse2");
                else
                        bwritestr(&b, "387");
        }

diff --git a/src/cmd/dist/plan9.c b/src/cmd/dist/plan9.c
index 8fef74f95df26b02f37ee056731c60697dd01033..56f922ced61c09a378cb62bb77ebe5ffedad2620 100644 (file)
--- a/src/cmd/dist/plan9.c
+++ b/src/cmd/dist/plan9.c
@@ -759,7 +759,7 @@ xtryexecfunc(void (*f)(void))
 }
 
 bool
-cansse(void)
+cansse2(void)
 {
        // if we had access to cpuid, could answer this question
        // less conservatively.

diff --git a/src/cmd/dist/unix.c b/src/cmd/dist/unix.c
index a99e5bfc4605187574afe35f191dcb57c0fa9afd..baf019ef9cd709bdabda70e9141f89271a5c9f75 100644 (file)
--- a/src/cmd/dist/unix.c
+++ b/src/cmd/dist/unix.c
@@ -780,7 +780,7 @@ __cpuid(int dst[4], int ax)
 }
 
 bool
-cansse(void)
+cansse2(void)
 {
        int info[4];
        

diff --git a/src/cmd/dist/windows.c b/src/cmd/dist/windows.c
index 4edb39cb586dcd2ecd223b4ccf45d5fd36c610f9..b23d8af475783f368d5e60a56434f90157ed8b74 100644 (file)
--- a/src/cmd/dist/windows.c
+++ b/src/cmd/dist/windows.c
@@ -987,7 +987,7 @@ cpuid(int dst[4], int ax)
 }
 
 bool
-cansse(void)
+cansse2(void)
 {
        int info[4];
        

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 3415d8f0de51828e59f63e658c8e800524e75454..d50b07ddca969b6089f88b80c792759328643a35 100644 (file)
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -217,7 +217,6 @@ main(int argc, char *argv[])
        goroot = getgoroot();
        goos = getgoos();
        goarch = thestring;
-       use_sse = strcmp(getgo386(), "sse") == 0;
        
        setexp();
 
@@ -261,6 +260,9 @@ main(int argc, char *argv[])
 
        flagparse(&argc, &argv, usage);
 
+       if(argc < 1)
+               usage();
+
        if(flag_race) {
                racepkg = mkpkg(strlit("runtime/race"));
                racepkg->name = "race";
@@ -273,8 +275,15 @@ main(int argc, char *argv[])
        if(debug['l'] <= 1)
                debug['l'] = 1 - debug['l'];
 
-       if(argc < 1)
-               usage();
+       if(thechar == '8') {
+               p = getgo386();
+               if(strcmp(p, "387") == 0)
+                       use_sse = 0;
+               else if(strcmp(p, "sse2") == 0)
+                       use_sse = 1;
+               else
+                       sysfatal("unsupported setting GO386=%s", p);
+       }
 
        pathname = mal(1000);
        if(getwd(pathname, 999) == 0)