[commit: ghc] master: fix 64bit two-stage allocator on Solaris/AMD64 platform (#10790) (b78494e)

git at git.haskell.org git at git.haskell.org
Tue Aug 25 19:50:02 UTC 2015


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

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

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

commit b78494eee787bdc0f9cc263b773638dc7db3482f
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Tue Aug 25 14:06:29 2015 +0200

    fix 64bit two-stage allocator on Solaris/AMD64 platform (#10790)
    
    Test Plan: tested on Solaris 11/AMD64 when previous build failed
    
    Reviewers: bgamari, austin, simonmar, gcampax, ezyang
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1169


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

b78494eee787bdc0f9cc263b773638dc7db3482f
 rts/posix/OSMem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index 976b5f5..aa3f3a1 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -156,7 +156,7 @@ my_mmap (void *addr, W_ size, int operation)
     else
         flags = 0;
 
-#if defined(solaris2_HOST_OS) || defined(irix_HOST_OS)
+#if defined(irix_HOST_OS)
     {
         if (operation & MEM_RESERVE)
         {



More information about the ghc-commits mailing list