[commit: ghc] master: rts: Fix build when USE_LARGE_ADDRESS_SPACE is undefined (6ace660)

git at git.haskell.org git at git.haskell.org
Sun Jun 12 09:48:19 UTC 2016


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

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

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

commit 6ace660a0354303797c033dabc164df91f7cb956
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Jun 12 17:50:39 2016 +1000

    rts: Fix build when USE_LARGE_ADDRESS_SPACE is undefined
    
    The recently added NUMA related functions were mistakenly defined
    within a `#ifdef USE_LARGE_ADDRESS_SPACE` ... `#endif` block. Moving
    them outside this block fixes the build on PowerPC and Arm Linux.
    
    Test Plan: Build on PowerPC or Arm Linux
    
    Reviewers: hvr, austin, bgamari, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2326


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

6ace660a0354303797c033dabc164df91f7cb956
 rts/posix/OSMem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index a534219..58310fe 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -544,6 +544,8 @@ void osReleaseHeapMemory(void)
         sysErrorBelch("unable to release address space");
 }
 
+#endif
+
 rtsBool osNumaAvailable(void)
 {
 #ifdef HAVE_NUMA_H
@@ -575,5 +577,3 @@ StgWord osNumaMask(void)
     return 1;
 #endif
 }
-
-#endif



More information about the ghc-commits mailing list