From: Rob Pike <r@golang.org>
Date: Wed, 8 Feb 2012 04:12:56 +0000 (+1100)
Subject: 5l: attempt to fix arm build
X-Git-Tag: weekly.2012-02-14~233
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9af4b0165486ec5b650ac28ff5d087908908cbc5;p=gostls13.git

5l: attempt to fix arm build
TBR=rsc

R=golang-dev
CC=golang-dev
https://golang.org/cl/5647049
---

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 0cc84d0eaf..4a3db99b00 100644
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -540,7 +540,7 @@ loop:
 			s->type = SBSS;
 			s->value = 0;
 		}
-		if(s->type != SBSS) {
+		if(s->type != SBSS && !s->dupok) {
 			diag("redefinition: %s\n%P", s->name, p);
 			s->type = SBSS;
 			s->value = 0;