Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/afbaa1120974c3401bfca8d987b4973291f600ec

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

commit afbaa1120974c3401bfca8d987b4973291f600ec
Author: Ian Lynagh <[email protected]>
Date:   Wed May 2 13:27:43 2012 +0100

    Add 'free' to the list of rtsSyms on Win64
    
    Without this, we ended up using
        (gdb) info symbol 0x7ff756a10ac
        msvcrt!free in section .text of C:\Windows\system32\msvcrt.dll
    for free, rather than
        (gdb) info symbol 0x2584128
        free in section .text of C:\m64\ghci2\q/../inplace/bin/ghc-stage2.exe
    but we were trying to put the address into a 32bit relocation.

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

 rts/Linker.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 48667b4..d4518ce 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -558,6 +558,7 @@ typedef struct _RtsSymbolVal {
       RTS_WIN64_ONLY(SymI_NeedsProto(__imp_GetConsoleMode))              \
       RTS_WIN64_ONLY(SymI_NeedsProto(__imp_SetConsoleMode))              \
       RTS_WIN64_ONLY(SymI_NeedsProto(__imp_FlushConsoleInputBuffer))     \
+      RTS_WIN64_ONLY(SymI_HasProto(free))                                \
       RTS_MINGW_GETTIMEOFDAY_SYM                         \
       SymI_NeedsProto(closedir)
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to