5c, 6c, 6l: fix Plan 9 build warnings

src/cmd/5c/reg.c:
. Added USED() attribute.

src/cmd/6c/cgen.c:
. Revised code around "REGARG" to resemble use in "8c" and
  consequently remove a warning.

src/cmd/6l/asm.c:
. Added USED() attributes.
. Removed an unnecessary assignment.

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

diff --git a/src/cmd/5c/reg.c b/src/cmd/5c/reg.c
index 50b814598d63734a103a66987678c56e86466d13..1ccf74a35deba853b927d51d6b60d84ff637474b 100644 (file)
--- a/src/cmd/5c/reg.c
+++ b/src/cmd/5c/reg.c
@@ -66,6 +66,7 @@ rcmp(const void *a1, const void *a2)
 void
 regopt(Prog *p)
 {
+       USED(p);
        // TODO(kaib): optimizer disabled because it smashes R8 when running out of registers
        // the disable is unconventionally here because the call is in common code shared by 5c/6c/8c
        return;

diff --git a/src/cmd/6c/cgen.c b/src/cmd/6c/cgen.c
index 7aa4aa976631463c0f21eafc7167632957929057..7f717dcbb4cb10e1c976cdbdd72f933c5c62f3e5 100644 (file)
--- a/src/cmd/6c/cgen.c
+++ b/src/cmd/6c/cgen.c
@@ -930,9 +930,6 @@ cgen(Node *n, Node *nn)
 
                        return;
                }
-               o = 0;
-               if(REGARG >= 0)
-                       o = reg[REGARG];
                gargs(r, &nod, &nod1);
                if(l->addable < INDEXED) {
                        reglcgen(&nod, l, nn);
@@ -941,9 +938,8 @@ cgen(Node *n, Node *nn)
                        regfree(&nod);
                } else
                        gopcode(OFUNC, n->type, Z, l);
-               if(REGARG >= 0)
-                       if(o != reg[REGARG])
-                               reg[REGARG]--;
+               if(REGARG >= 0 && reg[REGARG])
+                       reg[REGARG]--;
                if(nn != Z) {
                        regret(&nod, n);
                        gmove(&nod, nn);

diff --git a/src/cmd/6l/asm.c b/src/cmd/6l/asm.c
index f59a59efbe40e72f746fa05cb20fe110c6c43fe5..3a8223e65cceb5fc7b4b98215ada233898695ba3 100644 (file)
--- a/src/cmd/6l/asm.c
+++ b/src/cmd/6l/asm.c
@@ -298,6 +298,9 @@ adddynrel(Sym *s, Reloc *r)
 int
 archreloc(Reloc *r, Sym *s, vlong *val)
 {
+       USED(r);
+       USED(s);
+       USED(val);
        return -1;
 }
 
@@ -859,7 +862,7 @@ asmb(void)
                startva = INITTEXT - HEADR;
 
                /* This null SHdr must appear before all others */
-               sh = newElfShdr(elfstr[ElfStrEmpty]);
+               newElfShdr(elfstr[ElfStrEmpty]);
 
                /* program header info */
                pph = newElfPhdr();