cmd/6g, cmd/gc, cmd/ld: fix Plan 9 amd64 warnings

warning: src/cmd/6g/reg.c:671 format mismatch d VLONG, arg 4
warning: src/cmd/gc/pgen.c:230 set and not used: oldstksize
warning: src/cmd/gc/plive.c:877 format mismatch lx UVLONG, arg 2
warning: src/cmd/gc/walk.c:2878 set and not used: cbv
warning: src/cmd/gc/walk.c:2885 set and not used: hbv
warning: src/cmd/ld/data.c:198 format mismatch s IND FUNC(IND CHAR) INT, arg 2
warning: src/cmd/ld/data.c:230 format mismatch s IND FUNC(IND CHAR) INT, arg 2
warning: src/cmd/ld/dwarf.c:1517 set and not used: pc
warning: src/cmd/ld/elf.c:1507 format mismatch d VLONG, arg 2
warning: src/cmd/ld/ldmacho.c:509 set and not used: dsymtab

R=golang-dev, gobot, rsc
CC=golang-dev
https://golang.org/cl/36740045

diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c
index f5600f6827cdd4ea27f2bc857bd81a33d5e6e17e..320600b3577287511e3a21186e6c26166a1b68f6 100644 (file)
--- a/src/cmd/6g/reg.c
+++ b/src/cmd/6g/reg.c
@@ -668,7 +668,7 @@ mkvar(Reg *r, Adr *a)
        v->node = node;
 
        if(debug['R'])
-               print("bit=%2d et=%2E w=%d+%lld %#N %D flag=%d\n", i, et, o, w, node, a, v->addr);
+               print("bit=%2d et=%2E w=%lld+%lld %#N %D flag=%d\n", i, et, o, w, node, a, v->addr);
 
        ostats.nvar++;
 

diff --git a/src/cmd/gc/pgen.c b/src/cmd/gc/pgen.c
index 87225a4f88d65ea3912859326b183eb0db8db033..2a8a77975000f7896c87cf293256a0a73b380c12 100644 (file)
--- a/src/cmd/gc/pgen.c
+++ b/src/cmd/gc/pgen.c
@@ -232,6 +232,7 @@ compile(Node *fn)
 
        if(0)
                print("allocauto: %lld to %lld\n", oldstksize, (vlong)stksize);
+       USED(oldstksize);
 
        setlineno(curfn);
        if((int64)stksize+maxarg > (1ULL<<31)) {

diff --git a/src/cmd/gc/plive.c b/src/cmd/gc/plive.c
index 25d6e89b98bce4b14d40e2eab8b9ced08a283a8f..fd2888e4d206c98026d30fecc8475e94ab66759a 100644 (file)
--- a/src/cmd/gc/plive.c
+++ b/src/cmd/gc/plive.c
@@ -874,7 +874,7 @@ checkauto(Node *fn, Prog *p, Node *n, char *where)
        print("D_AUTO '%s' not found: name is '%s' function is '%s' class is %d\n", where, nname, fnname, n->class);
        print("Here '%P'\nlooking for node %p\n", p, n);
        for(ll = fn->dcl; ll != nil; ll = ll->next)
-               print("node=%lx, node->class=%d\n", (uintptr)ll->n, ll->n->class);
+               print("node=%p, node->class=%d\n", (uintptr)ll->n, ll->n->class);
        yyerror("checkauto: invariant lost");
 }
 

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index d28495d0b7a84b52a5bceabf49929e86294d1729..e1a909ce69337abfb0dace9de1a082c28e30e9d7 100644 (file)
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -2886,17 +2886,13 @@ sliceany(Node* n, NodeList **init)
 
        if(isconst(cb, CTINT)) {
                cbv = mpgetfix(cb->val.u.xval);
-               if(cbv < 0 || cbv > bv) {
+               if(cbv < 0 || cbv > bv)
                        yyerror("slice index out of bounds");
-                       cbv = -1;
-               }
        }
        if(isconst(hb, CTINT)) {
                hbv = mpgetfix(hb->val.u.xval);
-               if(hbv < 0 || hbv > bv) {
+               if(hbv < 0 || hbv > bv)
                        yyerror("slice index out of bounds");
-                       hbv = -1;
-               }
        }
        if(isconst(lb, CTINT)) {
                lbv = mpgetfix(lb->val.u.xval);

diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index db01463930d9d7f181ae14a2d22a4aa659f47649..0e3854fb57b79793b05f9ccfcb096f750aa6a21e 100644 (file)
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -195,7 +195,7 @@ relocsym(LSym *s)
                                        if(rs->type != SHOSTOBJ)
                                                o += symaddr(rs);
                                } else {
-                                       diag("unhandled pcrel relocation for %s", headtype);
+                                       diag("unhandled pcrel relocation for %s", headstring);
                                }
                                break;
                        }
@@ -227,7 +227,7 @@ relocsym(LSym *s)
                                                o += symaddr(rs) - rs->sect->vaddr;
                                        o -= r->off; // WTF?
                                } else {
-                                       diag("unhandled pcrel relocation for %s", headtype);
+                                       diag("unhandled pcrel relocation for %s", headstring);
                                }
                                break;
                        }

diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index c4f6b9d016ecf27c25ef0074a13cb28bd5c7116b..dd8a3d76066ea70b183568777777237552373e5d 100644 (file)
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -1514,7 +1514,6 @@ writelines(void)
 
        unitstart = -1;
        headerend = -1;
-       pc = 0;
        epc = 0;
        epcs = S;
        lineo = cpos();

diff --git a/src/cmd/ld/elf.c b/src/cmd/ld/elf.c
index 8c7ca86097847d8b0eedfc4d105741fc0aad6a7a..3b8bfb005706ac9c768dd999c6bf43d2571de537 100644 (file)
--- a/src/cmd/ld/elf.c
+++ b/src/cmd/ld/elf.c
@@ -1504,5 +1504,5 @@ elfobj:
                        a += elfwritebuildinfo();
        }
        if(a > ELFRESERVE)      
-               diag("ELFRESERVE too small: %d > %d", a, ELFRESERVE);
+               diag("ELFRESERVE too small: %lld > %d", a, ELFRESERVE);
 }

diff --git a/src/cmd/ld/ldmacho.c b/src/cmd/ld/ldmacho.c
index 7318381e35e93966dd48c91520bc5c0cca82be26..14db811277618057b81e047e88030f6a1081c7d9 100644 (file)
--- a/src/cmd/ld/ldmacho.c
+++ b/src/cmd/ld/ldmacho.c
@@ -507,6 +507,7 @@ ldmacho(Biobuf *f, char *pkg, int64 len, char *pn)
        c = nil;
        symtab = nil;
        dsymtab = nil;
+       USED(dsymtab);
        for(i=0; i<ncmd; i++){
                ty = e->e32(cmdp);
                sz = e->e32(cmdp+4);