[Pkg-haskell-commits] darcs: ghc: Drop hurd-is-ELF

[Joachim Breitner]

Mon Oct  8 11:13:23 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Drop hurd-is-ELF
  Ignore-this: e1c913a8333e35b7b46ac2fde9f8d96e

    R ./patches/hurd-is-ELF
    M ./patches/series -1

Mon Oct  8 11:13:23 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Drop hurd-is-ELF
  Ignore-this: e1c913a8333e35b7b46ac2fde9f8d96e
diff -rN -u old-ghc//patches/hurd-is-ELF new-ghc//patches/hurd-is-ELF
--- old-ghc//patches/hurd-is-ELF	2012-10-08 12:01:02.742225902 +0000
+++ new-ghc//patches/hurd-is-ELF	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Description: Hurd is ELF
- Some packages need the loadObj functionality, which is currently not
- available on hurd-i386 because ghc doesn't know that it simply uses
- ELF. The attached patch should fix that.
-Author: Samuel Thibault <sthibault at debian.org>
---- ghc-7.4.1.orig/rts/Linker.c
-+++ ghc-7.4.1/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
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-10-08 12:01:02.738226653 +0000
+++ new-ghc//patches/series	2012-10-08 12:01:03.370723661 +0000
@@ -4,6 +4,5 @@
 haddock-no-library
 armhf_llvm_abi
 ARM-VFPv3D16
-hurd-is-ELF
 no-missing-haddock-file-warning
 Fix-GHCi-segfault-on-linux-powerpc