diff options
| author | Russ Cox <rsc@golang.org> | 2010-10-15 15:29:25 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-10-15 15:29:25 -0400 |
| commit | 6e18e8c82f64017fe4a7a33ee79230d7387e8f69 (patch) | |
| tree | 6618078ee0e9a2e611f1403881769922e5ad8753 | |
| parent | 49a835fc9792bb569ef26728ba40f45befe468e2 (diff) | |
| download | go-6e18e8c82f64017fe4a7a33ee79230d7387e8f69.tar.gz go-6e18e8c82f64017fe4a7a33ee79230d7387e8f69.zip | |
8l: blind attempt to fix windows build
or at least gather more information
R=ken2
CC=golang-dev
https://golang.org/cl/2515042
| -rw-r--r-- | src/cmd/8l/obj.c | 2 | ||||
| -rw-r--r-- | src/cmd/ld/pe.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c index 2a5b8ca479..722857e9be 100644 --- a/src/cmd/8l/obj.c +++ b/src/cmd/8l/obj.c @@ -268,7 +268,7 @@ main(int argc, char *argv[]) if(INITDAT == -1) INITDAT = 0; if(INITRND == -1) - INITRND = PEALIGN; + INITRND = 4096; break; case 11: tlsoffset = 0; diff --git a/src/cmd/ld/pe.c b/src/cmd/ld/pe.c index 6faa515d30..0821af2689 100644 --- a/src/cmd/ld/pe.c +++ b/src/cmd/ld/pe.c @@ -109,7 +109,8 @@ dope(void) datsect = new_section(".data", segdata.filelen, 0); datsect->Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA| IMAGE_SCN_MEM_READ|IMAGE_SCN_MEM_WRITE; - INITDAT = PEBASE+datsect->VirtualAddress; + if(INITDAT != PEBASE+datsect->VirtualAddress) + diag("INITDAT = %#llux, want %#llux", (vlong)INITDAT, (vlong)(PEBASE+datsect->VirtualAddress)); bsssect = new_section(".bss", segdata.len - segdata.filelen, 1); bsssect->Characteristics = IMAGE_SCN_CNT_UNINITIALIZED_DATA| |