From: Russ Cox <rsc@golang.org>
Date: Thu, 19 Dec 2013 00:36:14 +0000 (-0500)
Subject: liblink: use explicit field for globl duplicate detection
X-Git-Tag: go1.3beta1~1150
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4890502af647b3df6995dda55cff3345836c7d67;p=gostls13.git

liblink: use explicit field for globl duplicate detection

Overloading size leads to problems if clients
try to set up an LSym by hand.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/44140043
---

diff --git a/include/link.h b/include/link.h
index c5089fc84c..2e23d20c7c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -131,6 +131,7 @@ struct	LSym
 	uchar	hide;
 	uchar	leaf;	// arm only
 	uchar	fnptr;	// arm only
+	uchar	seenglobl;
 	int16	symid;	// for writing .5/.6/.8 files
 	int32	dynid;
 	int32	sig;
diff --git a/src/liblink/objfile.c b/src/liblink/objfile.c
index ba4087f075..94a2561062 100644
--- a/src/liblink/objfile.c
+++ b/src/liblink/objfile.c
@@ -167,7 +167,8 @@ linkwriteobj(Link *ctxt, Biobuf *b)
 
 			if(p->as == ctxt->arch->AGLOBL) {
 				s = p->from.sym;
-				if(s->size) print("duplicate %P\n", p);
+				if(s->seenglobl++)
+					print("duplicate %P\n", p);
 				if(data == nil)
 					data = s;
 				else