[commit: ghc] ghc-7.4: Build fix for Hurd. (6fd28f6)
Paolo Capriotti
p.capriotti at gmail.com
Sun Jun 17 18:37:38 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/6fd28f6fc1c3ed38f678091188486855f648106e
>---------------------------------------------------------------
commit 6fd28f6fc1c3ed38f678091188486855f648106e
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date: Sun Jun 17 16:28:36 2012 +0100
Build fix for Hurd.
Patch by Samuel Thibault.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=659530.
MERGED from commit d2b538c80c00a99a51e4892dec475eae38cf9888
>---------------------------------------------------------------
rts/Linker.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rts/Linker.c b/rts/Linker.c
index 153a970..171fbac 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -74,7 +74,7 @@
( 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(kfreebsdgnu_HOST_OS) || defined(gnu_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
@@ -90,7 +90,7 @@
#endif
-#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS) || defined(gnu_HOST_OS)
# define OBJFORMAT_ELF
# include <regex.h> // regex is already used by dlopen() so this is OK
// to use here without requiring an additional lib
More information about the Cvs-ghc
mailing list