mirror of
https://github.com/golang/go
synced 2024-11-21 17:24:42 -07:00
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
This commit is contained in:
parent
8d29a09707
commit
433e47dc03
@ -551,12 +551,8 @@ loop:
|
||||
s->dupok = 1;
|
||||
if(p->reg & RODATA)
|
||||
s->type = SRODATA;
|
||||
else if(p->reg & NOPTR) {
|
||||
if(s->np > 0)
|
||||
s->type = SNOPTRDATA;
|
||||
else
|
||||
s->type = SNOPTRBSS;
|
||||
}
|
||||
else if(p->reg & NOPTR)
|
||||
s->type = SNOPTRBSS;
|
||||
break;
|
||||
|
||||
case ADATA:
|
||||
|
@ -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:
|
||||
|
@ -563,7 +563,7 @@ loop:
|
||||
s->type = SBSS;
|
||||
s->size = 0;
|
||||
}
|
||||
if(s->type != SBSS && s->type != SNOPTRDATA && !s->dupok) {
|
||||
if(s->type != SBSS && s->type != SNOPTRBSS && !s->dupok) {
|
||||
diag("%s: redefinition: %s in %s",
|
||||
pn, s->name, TNAME);
|
||||
s->type = SBSS;
|
||||
@ -576,7 +576,7 @@ loop:
|
||||
if(p->from.scale & RODATA)
|
||||
s->type = SRODATA;
|
||||
else if(p->from.scale & NOPTR)
|
||||
s->type = SNOPTRDATA;
|
||||
s->type = SNOPTRBSS;
|
||||
goto loop;
|
||||
|
||||
case ADATA:
|
||||
|
Loading…
Reference in New Issue
Block a user