[commit: ghc] master: fix RTS linker compilation failure on Solaris (40235c3)

git at git.haskell.org git at git.haskell.org
Mon Oct 19 15:28:39 UTC 2015


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

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

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

commit 40235c3844a5ab13472dc1bda28c148bc02d0108
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Sun Oct 18 22:41:40 2015 +0200

    fix RTS linker compilation failure on Solaris
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1341


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

40235c3844a5ab13472dc1bda28c148bc02d0108
 rts/Linker.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 51db363..8e5ffa1 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -78,7 +78,8 @@
     (   defined(linux_HOST_OS)     || defined(freebsd_HOST_OS) || \
         defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS ) || \
         defined(openbsd_HOST_OS  ) || defined(darwin_HOST_OS ) || \
-        defined(kfreebsdgnu_HOST_OS) || defined(gnu_HOST_OS)))
+        defined(kfreebsdgnu_HOST_OS) || defined(gnu_HOST_OS  ) || \
+        defined(solaris2_HOST_OS)))
 /* Don't use mmap on powerpc_HOST_ARCH as mmap doesn't support
  * reallocating but we need to allocate jump islands just after each
  * object images. Otherwise relative branches to jump islands can fail



More information about the ghc-commits mailing list