clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-21 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

liblink: fix field tracking

Browse Source 
The USEFIELD instructions no longer make it to the linker,
so we have to do something else to pin the references
they were pinning. Emit a 0-length relocation of type R_USEFIELD.

Fixes #7486.

LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews, r
https://golang.org/cl/95530043
This commit is contained in:
Russ Cox 2014-05-20 00:30:58 -04:00
parent 6aee29648f
commit d9c9665f1d
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/link.h
View File

@ -243,6 +243,7 @@ enum
R_PLT0,
R_PLT1,
R_PLT2,
R_USEFIELD,
};
// Auto.type

9
src/liblink/asm6.c
View File

@ -3443,6 +3443,15 @@ asmins(Link *ctxt, Prog *p)
ctxt->andptr = ctxt->and;
ctxt->asmode = p->mode;
if(p->as == AUSEFIELD) {
r = addrel(ctxt->cursym);
r->off = 0;
r->siz = 0;
r->sym = p->from.sym;
r->type = R_USEFIELD;
return;
}
if(ctxt->headtype == Hnacl) {
if(p->as == AREP) {
ctxt->rep++;

11
src/liblink/asm8.c
View File

@ -2744,7 +2744,18 @@ static uchar naclret[] = {
static void
asmins(Link *ctxt, Prog *p)
{
Reloc *r;
ctxt->andptr = ctxt->and;
if(p->as == AUSEFIELD) {
r = addrel(ctxt->cursym);
r->off = 0;
r->sym = p->from.sym;
r->type = R_USEFIELD;
r->siz = 0;
return;
}
if(ctxt->headtype == Hnacl) {
switch(p->as) {