[DHG_packages] 01/01: ghc Add patch for Sparc64. Again thanks to John Paul Adrian Glaubitz for the patch (Closes: #807777).

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository DHG_packages.

commit f46bbd1d15dd639b9bd88627501ce2b6c98ee98e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Dec 13 20:20:41 2015 +0100

    ghc Add patch for Sparc64. Again thanks to John Paul Adrian Glaubitz for the patch (Closes: #807777).
---
 p/ghc/debian/changelog                             |  5 ++
 p/ghc/debian/patches/series                        |  1 +
 .../patches/sparc64-initial-platform-support.patch | 58 ++++++++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index d2ceb0f..8a8ef7d 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,8 +1,13 @@
 ghc (7.10.3-4) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Disable PIE on s390x, since Ubuntu's toolchain defaults to enabling it
     there (closes: #807366).
 
+  [ Joachim Breitner ]
+  * Add patch for Sparc64. Again thanks to John Paul Adrian Glaubitz for the
+    patch (Closes: #807777).
+
  -- Colin Watson <cjwatson at debian.org>  Tue, 08 Dec 2015 11:59:35 +0000
 
 ghc (7.10.3-3) unstable; urgency=medium
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 5ff6d1a..c6d7a85 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -6,3 +6,4 @@ buildpath-abi-stability.patch
 reproducible-tmp-names
 cabal-show-detail-direct.patch
 sh4-platform-detection-support.patch
+sparc64-initial-platform-support.patch
diff --git a/p/ghc/debian/patches/sparc64-initial-platform-support.patch b/p/ghc/debian/patches/sparc64-initial-platform-support.patch
new file mode 100644
index 0000000..8959c22
--- /dev/null
+++ b/p/ghc/debian/patches/sparc64-initial-platform-support.patch
@@ -0,0 +1,58 @@
+Description: Add initial platform support for sparc64
+ This patch adds initial platform support for sparc64 by
+ mapping sparc64 to "ArchSPARC64" instead of "ArchUnknown"
+ in aclocal.m4. Additionally, it adds "ArchSPARC64" to the
+ list of known platforms in compiler/utils/Platform.hs
+ and patches compiler/main/DriverPipeline.hs to explicitly
+ pass -no-relax to gcc. See upstream ticket #11211 and
+ Debian bug #807777.
+ .
+
+Index: ghc/aclocal.m4
+===================================================================
+--- ghc.orig/aclocal.m4	2015-12-13 20:19:52.493676232 +0100
++++ ghc/aclocal.m4	2015-12-13 20:19:52.485676048 +0100
+@@ -193,6 +193,10 @@
+         sparc)
+             test -z "[$]2" || eval "[$]2=ArchSPARC"
+             ;;
++        sparc64)
++            test -z "[$]2" || eval "[$]2=ArchSPARC64"
++            ;;
++
+         arm)
+             GET_ARM_ISA()
+             test -z "[$]2" || eval "[$]2=\"ArchARM {armISA = \$ARM_ISA, armISAExt = \$ARM_ISA_EXT, armABI = \$ARM_ABI}\""
+@@ -209,7 +213,7 @@
+         mipsel)
+             test -z "[$]2" || eval "[$]2=ArchMipsel"
+             ;;
+-        hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sh4|sparc64|vax)
++        hppa|hppa1_1|ia64|m68k|powerpc64le|rs6000|s390|s390x|sh4|vax)
+             test -z "[$]2" || eval "[$]2=ArchUnknown"
+             ;;
+         *)
+Index: ghc/compiler/main/DriverPipeline.hs
+===================================================================
+--- ghc.orig/compiler/main/DriverPipeline.hs	2015-12-13 20:19:52.493676232 +0100
++++ ghc/compiler/main/DriverPipeline.hs	2015-12-13 20:19:52.489676140 +0100
+@@ -2208,6 +2208,7 @@
+                         -- -r and --relax are incompatible for ld, so
+                         -- disable --relax explicitly.
+                      ++ (if platformArch (targetPlatform dflags) == ArchSPARC
++                         || platformArch (targetPlatform dflags) == ArchSPARC64
+                          && ldIsGnuLd
+                             then [SysTools.Option "-Wl,-no-relax"]
+                             else [])
+Index: ghc/compiler/utils/Platform.hs
+===================================================================
+--- ghc.orig/compiler/utils/Platform.hs	2015-12-13 20:19:52.493676232 +0100
++++ ghc/compiler/utils/Platform.hs	2015-12-13 20:19:52.489676140 +0100
+@@ -48,6 +48,7 @@
+         | ArchPPC
+         | ArchPPC_64
+         | ArchSPARC
++        | ArchSPARC64
+         | ArchARM
+           { armISA    :: ArmISA
+           , armISAExt :: [ArmISAExt]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git