[Pkg-haskell-commits] darcs: ghc: patches/S390-Arch: Mention bitness of S390(x)

[Joachim Breitner]

Fri Dec 30 17:02:59 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/S390-Arch: Mention bitness of S390(x)
  Ignore-this: 6d997304ef9bcd0c6d9971f26363b36c

    M ./changelog +1
    A ./patches/S390-Arch
    M ./patches/series +1

Fri Dec 30 17:02:59 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/S390-Arch: Mention bitness of S390(x)
  Ignore-this: 6d997304ef9bcd0c6d9971f26363b36c
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:44:37.442751435 +0000
+++ new-ghc//changelog	2012-02-03 16:44:38.403249497 +0000
@@ -1,6 +1,7 @@
 ghc (7.4.0.20111219-3) UNRELEASED; urgency=low
 
   * patches/kfreebsd-OS: KFreeBSD is an ELF-based OK
+  * patches/S390-Arch: Mention bitness of S390(x)
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 30 Dec 2011 17:51:27 +0100
 
diff -rN -u old-ghc//patches/S390-Arch new-ghc//patches/S390-Arch
--- old-ghc//patches/S390-Arch	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/S390-Arch	2012-02-03 16:44:37.899248253 +0000
@@ -0,0 +1,45 @@
+Description: Note bitness of S390/S390x
+Author: Joachim Breitner <nomeata at debian.org>
+Bug: http://hackage.haskell.org/trac/ghc/ticket/5735
+
+Index: ghc-7.4.0.20111219/aclocal.m4
+===================================================================
+--- ghc-7.4.0.20111219.orig/aclocal.m4	2011-12-30 17:56:25.000000000 +0100
++++ ghc-7.4.0.20111219/aclocal.m4	2011-12-30 18:01:59.000000000 +0100
+@@ -183,7 +183,13 @@
+         mipsel)
+             test -z "[$]2" || eval "[$]2=ArchMipsel"
+             ;;
+-        hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
++        s390)
++            test -z "[$]2" || eval "[$]2=ArchS390"
++            ;;
++        s390x)
++            test -z "[$]2" || eval "[$]2=ArchS390x"
++            ;;
++        hppa|hppa1_1|ia64|m68k|rs6000|sparc64|vax)
+             test -z "[$]2" || eval "[$]2=ArchUnknown"
+             ;;
+         *)
+Index: ghc-7.4.0.20111219/compiler/utils/Platform.hs
+===================================================================
+--- ghc-7.4.0.20111219.orig/compiler/utils/Platform.hs	2011-12-30 17:56:25.000000000 +0100
++++ ghc-7.4.0.20111219/compiler/utils/Platform.hs	2011-12-30 18:02:06.000000000 +0100
+@@ -42,6 +42,8 @@
+         | ArchARM
+           { armISA    :: ArmISA
+           , armISAExt :: [ArmISAExt] }
++        | ArchS390
++        | ArchS390x
+         deriving (Read, Show, Eq)
+ 
+ 
+@@ -85,6 +87,8 @@
+                 ArchPPC_64  -> False
+                 ArchSPARC   -> True
+                 ArchARM _ _ -> True
++                ArchS390    -> True
++                ArchS390x   -> False
+ 
+ 
+ -- | This predicates tells us whether the OS supports ELF-like shared libraries.
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:44:37.426751687 +0000
+++ new-ghc//patches/series	2012-02-03 16:44:38.399352911 +0000
@@ -4,3 +4,4 @@
 use-debian-gen_contents_index
 haddock-no-library
 no_ghci_on_powerpc
+S390-Arch