[commit: ghc] master: Fix i386/Linux build. (a54ace7)

git at git.haskell.org git at git.haskell.org
Sat Aug 24 12:03:43 CEST 2013


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

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

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

commit a54ace7bfdcb7841cadeb0ce62b604f502050672
Author: Austin Seipp <aseipp at pobox.com>
Date:   Fri Aug 23 21:45:25 2013 -0500

    Fix i386/Linux build.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


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

a54ace7bfdcb7841cadeb0ce62b604f502050672
 rts/Linker.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index b193149..4961ecf 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -2057,11 +2057,15 @@ void freeObjectCode (ObjectCode *oc)
         sysErrorBelch("munmap");
     }
 
+#if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(arm_HOST_ARCH)
+#if !defined(x86_64_HOST_ARCH) || !defined(mingw32_HOST_OS)
     if (!USE_CONTIGUOUS_MMAP)
     {
         munmap(oc->symbol_extras,
                ROUND_UP(sizeof(SymbolExtra) * oc->n_symbol_extras, pagesize));
     }
+#endif
+#endif
 
 #else
 
@@ -2073,7 +2077,6 @@ void freeObjectCode (ObjectCode *oc)
 #endif
 #endif
 
-
 #endif
 
     stgFree(oc->fileName);





More information about the ghc-commits mailing list