From 433e47dc030c19402af1f62f78789ff2ccbb66ae Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 21 Feb 2012 23:04:38 -0500 Subject: ld: only set SNOPTRBSS during load dodata will convert to SNOPTRDATA if appropriate. Should fix arm build (hope springs eternal). TBR=golang-dev CC=golang-dev https://golang.org/cl/5687074 --- src/cmd/6l/obj.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/cmd/6l/obj.c') diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c index f441f3303d..692cab7b81 100644 --- a/src/cmd/6l/obj.c +++ b/src/cmd/6l/obj.c @@ -567,12 +567,8 @@ loop: s->dupok = 1; if(p->from.scale & RODATA) s->type = SRODATA; - else if(p->from.scale & NOPTR) { - if(s->np > 0) - s->type = SNOPTRDATA; - else - s->type = SNOPTRBSS; - } + else if(p->from.scale & NOPTR) + s->type = SNOPTRBSS; goto loop; case ADATA: -- cgit v1.3-5-g9baa