[Pkg-haskell-commits] darcs: ghc: patches/hurd-is-ELF added, Closes: #659530, thanks to Samuel Thibault
Joachim Breitner
mail at joachim-breitner.de
Sat Mar 10 16:53:07 UTC 2012
Sat Feb 11 22:38:20 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* patches/hurd-is-ELF added, Closes: #659530, thanks to Samuel Thibault
Ignore-this: 70a043c65d7fa3eabdfaf96f6531c32
M! ./changelog -16
A! ./patches/hurd-is-ELF
M! ./patches/series -2
Sat Feb 11 22:38:20 UTC 2012 Joachim Breitner <mail at joachim-breitner.de>
* patches/hurd-is-ELF added, Closes: #659530, thanks to Samuel Thibault
Ignore-this: 70a043c65d7fa3eabdfaf96f6531c32
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog 2012-03-10 16:53:06.841749456 +0000
+++ new-ghc//changelog 2012-03-10 16:53:06.898246544 +0000
@@ -1,19 +1,3 @@
-ghc (7.4.1-2) UNRELEASED; urgency=low
-
- * Two new patches (backported by Iulian Udrea) to fix armel build
- failures. See upstream bug #5824.
- - fix-ARM-s-StgCRun-clobbered-register-list-for-both-A
- - fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis
- * Use dh_autoreconf{,_clean} to autoreconf, mainly so we can have proper
- clean support.
- * armhf support (thanks to Jani Monoses):
- - debian/patches/ARM-VFPv3D16: Use vfp3-d16 FPU for ARM builds.
- - debian/patches/armhf_llvm_abi: Pass -float-abi=hard to llc on armhf if
- __ARM_PCS_VFP is defined (needs to be preprocessed for this)
- - debian/rules: Define __ARM_PCS_VFP on armhf for the above patch.
-
- -- Iain Lane <laney at debian.org> Sat, 10 Mar 2012 15:55:03 +0000
-
ghc (7.4.1-1) unstable; urgency=low
* New upstream release.
diff -rN -u old-ghc//patches/hurd-is-ELF new-ghc//patches/hurd-is-ELF
--- old-ghc//patches/hurd-is-ELF 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/hurd-is-ELF 2012-03-10 16:53:06.890245910 +0000
@@ -0,0 +1,25 @@
+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-03-10 16:53:06.793752524 +0000
+++ new-ghc//patches/series 2012-03-10 16:53:06.898246544 +0000
@@ -6,5 +6,3 @@
haddock-no-library
no_ghci_on_powerpc
use-llvm-3.0
-armhf_llvm_abi
-ARM-VFPv3D16
More information about the Pkg-haskell-commits
mailing list