From: sof <unknown>
Date: Thu, 27 Oct 2005 01:27:37 +0000 (+0000)
Subject: [project @ 2005-10-27 01:27:37 by sof]
X-Git-Tag: Initial_conversion_from_CVS_complete~117
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=53068b73f9ad46f3bea066f3270230c5d38d9b9f

[project @ 2005-10-27 01:27:37 by sof]
ocGetNames_PEi386(): fix bug in previous commit to this function;
the correct .bss size for object files wasn't being passed to
addProddableBlock().
Not directly harmful, but triggers ASSERT() failure w/ DEBUG.

Merge to STABLE.
---

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 7165443..62fc9fa 100644
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -2047,7 +2047,7 @@ ocGetNames_PEi386 ( ObjectCode* oc )
       if ( bss_sz < sectab_i->SizeOfRawData) { bss_sz = sectab_i->SizeOfRawData; }
       zspace = stgCallocBytes(1, bss_sz, "ocGetNames_PEi386(anonymous bss)");
       sectab_i->PointerToRawData = ((UChar*)zspace) - ((UChar*)(oc->image));
-      addProddableBlock(oc, zspace, sectab_i->VirtualSize);
+      addProddableBlock(oc, zspace, bss_sz);
       /* debugBelch("BSS anon section at 0x%x\n", zspace); */
    }