diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2012-09-03 03:51:13 +0800 |
|---|---|---|
| committer | Shenghou Ma <minux.ma@gmail.com> | 2012-09-03 03:51:13 +0800 |
| commit | 88ba4de152c8d81f73a3d60f63dc79a140add33a (patch) | |
| tree | 99a8b81d07a7b5ec8bc6861fe3452811149b399f /src/cmd/5l/obj.c | |
| parent | 5b7562dd6fe04aa3e827c66ee7ac7b57b6afa667 (diff) | |
| download | go-88ba4de152c8d81f73a3d60f63dc79a140add33a.tar.xz | |
cmd/5l: embed $GOARM value into binary as runtime.goarm
R=golang-dev, dave, rsc
CC=golang-dev
https://golang.org/cl/6449127
Diffstat (limited to 'src/cmd/5l/obj.c')
| -rw-r--r-- | src/cmd/5l/obj.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c index 05967ac9c0..0e738394c8 100644 --- 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(); |
