]> Cypherpunks repositories - gostls13.git/commitdiff
5l: attempt to fix arm build
authorRob Pike <r@golang.org>
Wed, 8 Feb 2012 04:12:56 +0000 (15:12 +1100)
committerRob Pike <r@golang.org>
Wed, 8 Feb 2012 04:12:56 +0000 (15:12 +1100)
TBR=rsc

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

src/cmd/5l/obj.c

index 0cc84d0eaf97035b79eb9cc18a105ad072ec61b7..4a3db99b0017d183218c9ccd01f874514f633acf 100644 (file)
@@ -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;