goos and goarch

SVN=121349

diff --git a/src/cmd/6a/lex.c b/src/cmd/6a/lex.c
index ff0a0d56ee8e8cb961570d97a9836e65dae0627c..1a1e30f1523302d9401e18e3700fb0f58901325b 100644 (file)
--- a/src/cmd/6a/lex.c
+++ b/src/cmd/6a/lex.c
@@ -41,6 +41,7 @@ main(int argc, char *argv[])
 
        thechar = '6';
        thestring = "amd64";
+
        memset(debug, 0, sizeof(debug));
        cinit();
        outfile = 0;
@@ -166,7 +167,7 @@ assemble(char *file)
        pass = 1;
        pinit(file);
 
-       Bprint(&obuf, "x86-64\n");
+       Bprint(&obuf, "%s\n", thestring);
 
        for(i=0; i<nDlist; i++)
                dodefine(Dlist[i]);

diff --git a/src/cmd/6c/swt.c b/src/cmd/6c/swt.c
index 5b2a6ca1eb67137db5274154181a71520f10c8f0..90bd545cc07098ebc831b8c101be5b4fc8f09e3e 100644 (file)
--- a/src/cmd/6c/swt.c
+++ b/src/cmd/6c/swt.c
@@ -231,7 +231,7 @@ outcode(void)
        }
        Binit(&b, f, OWRITE);
 
-       Bprint(&b, "x86-64\n");
+       Bprint(&b, "%s\n", thestring);
        Bprint(&b, "!\n");
 
        outhist(&b);

diff --git a/src/cmd/6g/obj.c b/src/cmd/6g/obj.c
index 47ae0abf05cc5302854d61f49b67ef23e97ac565..01014655ca20710389c44e26987a617c3c3344c9 100644 (file)
--- a/src/cmd/6g/obj.c
+++ b/src/cmd/6g/obj.c
@@ -49,7 +49,7 @@ dumpobj(void)
        if(bout == nil)
                fatal("cant open %s", outfile);
 
-       Bprint(bout, "x86-64\n");
+       Bprint(bout, "amd64\n");
        Bprint(bout, "  exports automatically generated from\n");
        Bprint(bout, "  %s in package \"%s\"\n", curio.infile, package);
        dumpexport();