qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 16:54:43 -07:00
Code Releases Activity

cmd/8l: accept R_386_GOT32 in push instruction

Browse Source 
Fixes #8382.

LGTM=iant
R=iant
CC=golang-codereviews
https://golang.org/cl/149540045
This commit is contained in:
Russ Cox 2014-10-06 14:17:48 -04:00
parent 52fe7c56cd
commit 609d996fac
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd/8l/asm.c
View File

@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r)
case 256 + R_386_GOT32:
if(targ->type != SDYNIMPORT) {
// have symbol
// turn MOVL of GOT entry into LEAL of symbol itself
if(r->off < 2 || s->p[r->off-2] != 0x8b) {
diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
// turn MOVL of GOT entry into LEAL of symbol address, relative to GOT.
s->p[r->off-2] = 0x8d;
r->type = R_GOTOFF;
return;
}
s->p[r->off-2] = 0x8d;
r->type = R_GOTOFF;
if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) {
// turn PUSHL of GOT entry into PUSHL of symbol itself.
// use unnecessary SS prefix to keep instruction same length.
s->p[r->off-2] = 0x36;
s->p[r->off-1] = 0x68;
r->type = R_ADDR;
return;
}
diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
return;
}
addgotsym(ctxt, targ);