[commit: ghc] master: Silence the linker on Windows so tests pass (603a369)

git at git.haskell.org git at git.haskell.org
Sat Oct 17 13:18:07 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/603a369dbf46c70759d680708ae48326f7121b28/ghc

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

commit 603a369dbf46c70759d680708ae48326f7121b28
Author: Tamar Christina <tamar at zhox.com>
Date:   Sat Oct 17 15:19:56 2015 +0200

    Silence the linker on Windows so tests pass
    
    Silence the unconditional debugBelch statements recently added to HEAD
    which on Windows cause debug information to always be printed.
    
    Differential Revision: https://phabricator.haskell.org/D1338


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

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

diff --git a/rts/Linker.c b/rts/Linker.c
index 173b90d..51db363 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4736,7 +4736,7 @@ ocGetNames_PEi386 ( ObjectCode* oc )
        addSection(&sections[oc->n_sections-1],
                   SECTIONKIND_RWDATA, SECTION_MALLOC,
                   bss, globalBssSize, 0, 0, 0);
-       debugBelch("bss @ %p %" FMT_Word "\n", bss, globalBssSize);
+       IF_DEBUG(linker, debugBelch("bss @ %p %" FMT_Word "\n", bss, globalBssSize));
        addProddableBlock(oc, bss, globalBssSize);
    } else {
        addSection(&sections[oc->n_sections-1],
@@ -4781,7 +4781,7 @@ ocGetNames_PEi386 ( ObjectCode* oc )
             Allocate zeroed space for it from the BSS section */
           addr = bss;
           bss = (void *)((StgWord)bss + (StgWord)symtab_i->Value);
-          debugBelch("bss symbol @ %p %u\n", addr, symtab_i->Value);
+          IF_DEBUG(linker, debugBelch("bss symbol @ %p %u\n", addr, symtab_i->Value));
       }
 
       if (addr != NULL ) {



More information about the ghc-commits mailing list