From: David du Colombier <0intro@gmail.com>
Date: Fri, 14 Nov 2014 21:57:33 +0000 (+0100)
Subject: [dev.cc] liblink: fix warnings on Plan 9
X-Git-Tag: go1.5beta1~2688^2~45
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1f420c13bd693fc94e112927602b75a4da9dbc0f;p=gostls13.git

[dev.cc] liblink: fix warnings on Plan 9

warning: src/liblink/asm9.c:501 set and not used: bflag
warning: src/liblink/list9.c:259 format mismatch .5lux INT, arg 4
warning: src/liblink/list9.c:261 format mismatch .5lux INT, arg 3
warning: src/liblink/list9.c:319 more arguments than format VLONG
warning: src/liblink/obj9.c:222 set and not used: autoffset

LGTM=bradfitz, austin
R=rsc, bradfitz
CC=austin, golang-codereviews
https://golang.org/cl/175070043
---

diff --git a/src/liblink/asm9.c b/src/liblink/asm9.c
index c5a78e53ca..3c125b3b0f 100644
--- a/src/liblink/asm9.c
+++ b/src/liblink/asm9.c
@@ -498,7 +498,6 @@ span9(Link *ctxt, LSym *cursym)
 	if(oprange[AANDN].start == nil)
  		buildop(ctxt);
 
-	bflag = 0;
 	c = 0;	
 	p->pc = c;
 
diff --git a/src/liblink/list9.c b/src/liblink/list9.c
index c9190d8940..512ed5a119 100644
--- a/src/liblink/list9.c
+++ b/src/liblink/list9.c
@@ -256,9 +256,9 @@ Dconv(Fmt *fp)
 			//if(v >= INITTEXT)
 			//	v -= INITTEXT-HEADR;
 			if(a->sym != nil)
-				sprint(str, "%s+%.5lux(BRANCH)", a->sym->name, v);
+				sprint(str, "%s+%.5ux(BRANCH)", a->sym->name, v);
 			else
-				sprint(str, "%.5lux(BRANCH)", v);
+				sprint(str, "%.5ux(BRANCH)", v);
 		} else if(a->u.branch != nil)
 			sprint(str, "%lld", a->u.branch->pc);
 		else if(a->sym != nil)
@@ -316,7 +316,7 @@ Mconv(Fmt *fp)
 		if(a->offset != 0)
 			sprint(str, "%s+%lld(SB)", s->name, a->offset);
 		else
-			sprint(str, "%s(SB)", s->name, a->offset);
+			sprint(str, "%s(SB)", s->name);
 		break;
 
 	case D_STATIC:
diff --git a/src/liblink/obj9.c b/src/liblink/obj9.c
index 0bae64d0b8..10a1f16353 100644
--- a/src/liblink/obj9.c
+++ b/src/liblink/obj9.c
@@ -202,7 +202,7 @@ addstacksplit(Link *ctxt, LSym *cursym)
 	Prog *p, *q, *p1, *p2, *q1;
 	int o, mov, aoffset;
 	vlong textstksiz, textarg;
-	int32 autoffset, autosize;
+	int32 autosize;
 
 	if(ctxt->symmorestack[0] == nil) {
 		ctxt->symmorestack[0] = linklookup(ctxt, "runtime.morestack", 0);
@@ -217,9 +217,6 @@ addstacksplit(Link *ctxt, LSym *cursym)
 
 	p = cursym->text;
 	parsetextconst(p->to.offset, &textstksiz, &textarg);
-	autoffset = textstksiz;
-	if(autoffset < 0)
-		autoffset = 0;
 	
 	cursym->args = p->to.offset>>32;
 	cursym->locals = textstksiz;