diff options
| author | Wei Guangjing <vcc.163@gmail.com> | 2011-07-19 10:47:33 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-07-19 10:47:33 -0400 |
| commit | 9f636598ba2425cbc31e416599f430829fa36b20 (patch) | |
| tree | 19bc60df7034f0e6cddfc7566be8297d6095e3a2 /src/cmd/ld | |
| parent | 0b200b4d0902459551812dd18642332e494c7d12 (diff) | |
| download | go-9f636598ba2425cbc31e416599f430829fa36b20.tar.xz | |
cgo: windows amd64 port
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4725041
Diffstat (limited to 'src/cmd/ld')
| -rw-r--r-- | src/cmd/ld/data.c | 40 | ||||
| -rw-r--r-- | src/cmd/ld/ldpe.c | 29 |
2 files changed, 64 insertions, 5 deletions
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c index 2153fdebd4..9974dbc513 100644 --- a/src/cmd/ld/data.c +++ b/src/cmd/ld/data.c @@ -36,6 +36,7 @@ #include "../ld/pe.h" void dynreloc(void); +static vlong addaddrplus4(Sym *s, Sym *t, int32 add); /* * divide-and-conquer list-link @@ -255,11 +256,19 @@ dynrelocsym(Sym *s) r->add = targ->plt; // jmp *addr - adduint8(rel, 0xff); - adduint8(rel, 0x25); - addaddr(rel, targ); - adduint8(rel, 0x90); - adduint8(rel, 0x90); + if(thechar == '8') { + adduint8(rel, 0xff); + adduint8(rel, 0x25); + addaddr(rel, targ); + adduint8(rel, 0x90); + adduint8(rel, 0x90); + } else { + adduint8(rel, 0xff); + adduint8(rel, 0x24); + adduint8(rel, 0x25); + addaddrplus4(rel, targ, 0); + adduint8(rel, 0x90); + } } else if(r->sym->plt >= 0) { r->sym = rel; r->add = targ->plt; @@ -679,6 +688,27 @@ addaddrplus(Sym *s, Sym *t, int32 add) } vlong +addaddrplus4(Sym *s, Sym *t, int32 add) +{ + vlong i; + Reloc *r; + + if(s->type == 0) + s->type = SDATA; + s->reachable = 1; + i = s->size; + s->size += 4; + symgrow(s, s->size); + r = addrel(s); + r->sym = t; + r->off = i; + r->siz = 4; + r->type = D_ADDR; + r->add = add; + return i; +} + +vlong addpcrelplus(Sym *s, Sym *t, int32 add) { vlong i; diff --git a/src/cmd/ld/ldpe.c b/src/cmd/ld/ldpe.c index 98c866feeb..3e2b57112a 100644 --- a/src/cmd/ld/ldpe.c +++ b/src/cmd/ld/ldpe.c @@ -73,6 +73,24 @@ #define IMAGE_REL_I386_SECREL7 0x000D #define IMAGE_REL_I386_REL32 0x0014 +#define IMAGE_REL_AMD64_ABSOLUTE 0x0000 +#define IMAGE_REL_AMD64_ADDR64 0x0001 // R_X86_64_64 +#define IMAGE_REL_AMD64_ADDR32 0x0002 // R_X86_64_PC32 +#define IMAGE_REL_AMD64_ADDR32NB 0x0003 +#define IMAGE_REL_AMD64_REL32 0x0004 +#define IMAGE_REL_AMD64_REL32_1 0x0005 +#define IMAGE_REL_AMD64_REL32_2 0x0006 +#define IMAGE_REL_AMD64_REL32_3 0x0007 +#define IMAGE_REL_AMD64_REL32_4 0x0008 +#define IMAGE_REL_AMD64_REL32_5 0x0009 +#define IMAGE_REL_AMD64_SECTION 0x000A +#define IMAGE_REL_AMD64_SECREL 0x000B +#define IMAGE_REL_AMD64_SECREL7 0x000C +#define IMAGE_REL_AMD64_TOKEN 0x000D +#define IMAGE_REL_AMD64_SREL32 0x000E +#define IMAGE_REL_AMD64_PAIR 0x000F +#define IMAGE_REL_AMD64_SSPAN32 0x0010 + typedef struct PeSym PeSym; typedef struct PeSect PeSect; typedef struct PeObj PeObj; @@ -261,6 +279,7 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn) default: diag("%s: unknown relocation type %d;", pn, type); case IMAGE_REL_I386_REL32: + case IMAGE_REL_AMD64_REL32: rp->type = D_PCREL; rp->add = 0; break; @@ -270,6 +289,16 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn) // load addend from image rp->add = le32(rsect->base+rp->off); break; + case IMAGE_REL_AMD64_ADDR32: // R_X86_64_PC32 + rp->type = D_PCREL; + rp->add += 4; + break; + case IMAGE_REL_AMD64_ADDR64: // R_X86_64_64 + rp->siz = 8; + rp->type = D_ADDR; + // load addend from image + rp->add = le64(rsect->base+rp->off); + break; } } qsort(r, rsect->sh.NumberOfRelocations, sizeof r[0], rbyoff); |