8l: blind attempt to fix windows build

or at least gather more information

R=ken2
CC=golang-dev
https://golang.org/cl/2515042

diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c
index 2a5b8ca479b9998bac9e1ac660fda93fe9cc59c7..722857e9be4f82ce3f4e8a691bf8e745696588c7 100644 (file)
--- 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 6faa515d30ea9b3235062e949f412eb417ca3729..0821af268938216540766e0a0540649c86ae1f2a 100644 (file)
--- 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|