From: Russ Cox <rsc@golang.org>
Date: Thu, 19 Dec 2013 21:52:47 +0000 (-0500)
Subject: liblink: allow either of a pair of conflicting symbols to say dupok
X-Git-Tag: go1.3beta1~1135
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c9f12d2289252d56aa88263c56be217255d95ee5;p=gostls13.git

liblink: allow either of a pair of conflicting symbols to say dupok

This makes the linker's -X flag work again.

R=iant
CC=bradfitz, golang-codereviews, golang-dev
https://golang.org/cl/44360043
---

diff --git a/src/liblink/objfile.c b/src/liblink/objfile.c
index 94a2561062..52ec90d688 100644
--- a/src/liblink/objfile.c
+++ b/src/liblink/objfile.c
@@ -503,7 +503,7 @@ readsym(Link *ctxt, Biobuf *f, char *pkg, char *pn)
 		v = ctxt->version;
 	s = linklookup(ctxt, name, v);
 	if(s->type != 0 && s->type != SXREF) {
-		if(s->type != SBSS && s->type != SNOPTRBSS && (!dupok || !s->dupok))
+		if(s->type != SBSS && s->type != SNOPTRBSS && !dupok && !s->dupok)
 			sysfatal("duplicate symbol %s (types %d and %d) in %s and %s", s->name, s->type, t, s->file, pn);
 		if(s->np > 0)
 			s = linklookup(ctxt, ".dup", ndup++); // scratch