diff options
| author | David du Colombier <0intro@gmail.com> | 2013-07-22 17:33:41 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-07-22 17:33:41 -0400 |
| commit | b015af41171f00c5f6b263aafd73df6c4e58443a (patch) | |
| tree | 758ac4094127b9c1b906f7f4ab54a0985eb3a36b /src/cmd/ld/lib.c | |
| parent | e97d677b4eaa6db4d70ae1d855d2cc5a4b0fdeff (diff) | |
| download | go-b015af41171f00c5f6b263aafd73df6c4e58443a.tar.xz | |
cmd/ld: fix warnings on Plan 9
src/cmd/ld/lib.c:1379 set and not used: p
src/cmd/ld/lib.c:1426 format mismatch 6llux INT, arg 3
src/cmd/ld/lib.c:1437 format mismatch 6llux INT, arg 3
src/cmd/ld/lib.c:1456 format mismatch 6llux INT, arg 3
src/cmd/ld/lib.c:1477 format mismatch 6llux INT, arg 3
src/cmd/ld/lib.c:1459 set and not used: started
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/11615044
Diffstat (limited to 'src/cmd/ld/lib.c')
| -rw-r--r-- | src/cmd/ld/lib.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c index 49f2bc304c..94446c3bbb 100644 --- a/src/cmd/ld/lib.c +++ b/src/cmd/ld/lib.c @@ -1376,7 +1376,7 @@ addvarint(Sym *s, uint32 val) p = s->p + s->np - n; for(v = val; v >= 0x80; v >>= 7) *p++ = v | 0x80; - *p++ = v; + *p = v; } // funcpctab appends to dst a pc-value table mapping the code in func to the values @@ -1423,7 +1423,7 @@ funcpctab(Sym *dst, Sym *func, char *desc, int32 (*valfunc)(Sym*, int32, Prog*, if(val == oldval && started) { val = valfunc(func, val, p, 1, arg); if(debug['O']) - Bprint(&bso, "%6llux %6s %P\n", p->pc, "", p); + Bprint(&bso, "%6llux %6s %P\n", (vlong)p->pc, "", p); continue; } @@ -1434,7 +1434,7 @@ funcpctab(Sym *dst, Sym *func, char *desc, int32 (*valfunc)(Sym*, int32, Prog*, if(p->link && p->link->pc == p->pc) { val = valfunc(func, val, p, 1, arg); if(debug['O']) - Bprint(&bso, "%6llux %6s %P\n", p->pc, "", p); + Bprint(&bso, "%6llux %6s %P\n", (vlong)p->pc, "", p); continue; } @@ -1453,11 +1453,9 @@ funcpctab(Sym *dst, Sym *func, char *desc, int32 (*valfunc)(Sym*, int32, Prog*, // where the 0x80 bit indicates that the integer continues. if(debug['O']) - Bprint(&bso, "%6llux %6d %P\n", p->pc, val, p); + Bprint(&bso, "%6llux %6d %P\n", (vlong)p->pc, val, p); - if(!started) - started = 1; - else { + if(started) { addvarint(dst, (p->pc - pc) / MINLC); pc = p->pc; } @@ -1474,7 +1472,7 @@ funcpctab(Sym *dst, Sym *func, char *desc, int32 (*valfunc)(Sym*, int32, Prog*, if(started) { if(debug['O']) - Bprint(&bso, "%6llux done\n", func->value+func->size); + Bprint(&bso, "%6llux done\n", (vlong)func->value+func->size); addvarint(dst, (func->value+func->size - pc) / MINLC); addvarint(dst, 0); // terminator } |