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 c5089fc84c673f851014ec859ce6a454754783e8..2e23d20c7c4ede4ecaf5bf71e408e1d86982fb11 100644 (file)
--- 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 ba4087f07552050752aefd46b420ef229eeebd14..94a2561062a82573309250360ee5541ef558eadd 100644 (file)
--- 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