[commit: ghc] ghc-8.0: Linker: Fix Windows codepath (bd3506c)

git at git.haskell.org git at git.haskell.org
Thu Sep 1 18:25:32 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/bd3506c3de60abf4aafd27844cba44fc1523103a/ghc

>---------------------------------------------------------------

commit bd3506c3de60abf4aafd27844cba44fc1523103a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Sep 1 10:04:41 2016 -0400

    Linker: Fix Windows codepath
    
    Thanks to Phyx for the patch.


>---------------------------------------------------------------

bd3506c3de60abf4aafd27844cba44fc1523103a
 rts/Linker.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 8e00b92..82a37c8 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4102,13 +4102,13 @@ ocGetNames_PEi386 ( ObjectCode* oc )
    if (globalBssSize > 0) {
        bss = stgCallocBytes(1, globalBssSize,
                             "ocGetNames_PEi386(non-anonymous bss)");
-       addSection(&sections[oc->n_sections-1],
+       addSection(&oc->sections[oc->n_sections-1],
                   SECTIONKIND_RWDATA, SECTION_MALLOC,
                   bss, globalBssSize, 0, 0, 0);
        IF_DEBUG(linker, debugBelch("bss @ %p %" FMT_Word "\n", bss, globalBssSize));
        addProddableBlock(oc, bss, globalBssSize);
    } else {
-       addSection(&sections[oc->n_sections-1],
+       addSection(&oc->sections[oc->n_sections-1],
                   SECTIONKIND_OTHER, SECTION_NOMEM, NULL, 0, 0, 0, 0);
    }
 



More information about the ghc-commits mailing list