cmd/5l: embed $GOARM value into binary as runtime.goarm

R=golang-dev, dave, rsc
CC=golang-dev
https://golang.org/cl/6449127

diff --git a/src/cmd/5l/l.h b/src/cmd/5l/l.h
index e6f2ec3d98fa577034f759746ff0b87c0571a867..ee2794ae00f0d349bfe0db75ab4dc548eff74a92 100644 (file)
--- a/src/cmd/5l/l.h
+++ b/src/cmd/5l/l.h
@@ -307,6 +307,7 @@ EXTERN      Prog    zprg;
 EXTERN int     dtype;
 EXTERN int     tlsoffset;
 EXTERN int     armsize;
+EXTERN int     goarm;
 
 extern char*   anames[];
 extern Optab   optab[];

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 05967ac9c01dcf70f2c98df423b779f8b79fa07c..0e738394c82fe486a2d64dbe5f7531c3ba9e6e26 100644 (file)
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -76,6 +76,7 @@ main(int argc, char *argv[])
 {
        int c;
        char *p, *name, *val;
+       Sym *s;
 
        Binit(&bso, 1, OWRITE);
        listinit();
@@ -89,7 +90,11 @@ main(int argc, char *argv[])
        nuxiinit();
        
        p = getenv("GOARM");
-       if(p != nil && strcmp(p, "5") == 0)
+       if(p != nil)
+               goarm = atoi(p);
+       else
+               goarm = 7;
+       if(goarm == 5)
                debug['F'] = 1;
 
        ARGBEGIN {
@@ -243,6 +248,11 @@ main(int argc, char *argv[])
        cbp = buf.cbuf;
        cbc = sizeof(buf.cbuf);
 
+       // embed goarm to runtime.goarm
+       s = lookup("runtime.goarm", 0);
+       s->dupok = 1;
+       adduint8(s, goarm);
+
        addlibpath("command line", "command line", argv[0], "main");
        loadlib();