packages: ghc/ghc-pld.patch - merged from DEVEL

[baggins]

Author: baggins                      Date: Fri Aug 27 10:50:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/ghc:
   ghc-pld.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/ghc/ghc-pld.patch
diff -u /dev/null packages/ghc/ghc-pld.patch:1.10
--- /dev/null	Fri Aug 27 12:50:35 2010
+++ packages/ghc/ghc-pld.patch	Fri Aug 27 12:50:30 2010
@@ -0,0 +1,117 @@
+--- ghc-6.12.1/configure.ac~	2009-12-10 19:11:33.000000000 +0100
++++ ghc-6.12.1/configure.ac	2010-04-08 15:50:31.639124660 +0200
+@@ -274,7 +274,7 @@
+ 
+ checkArch() {
+     case $1 in
+-    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
++    alpha|arm|hppa|hppa1_1|i386|i486|i586|i686|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
+         ;;
+     *)
+         echo "Unknown arch $1"
+@@ -285,7 +285,7 @@
+ 
+ checkVendor() {
+     case $1 in
+-    dec|unknown|hp|apple|next|sun|sgi|ibm)
++    pld|dec|unknown|hp|apple|next|sun|sgi|ibm)
+         ;;
+     *)
+         echo "Unknown vendor $1"
+--- ghc-6.12.1/libraries/terminfo/configure.ac~	2009-09-15 08:09:05.000000000 +0200
++++ ghc-6.12.1/libraries/terminfo/configure.ac	2010-04-08 16:43:45.040705349 +0200
+@@ -13,7 +13,8 @@
+     [curses_libraries=NONE])
+ 
+ 
+-TERMINFO_INCLUDE_DIRS=
++TERMINFO_INCLUDE_DIRS=/usr/include/ncursesw
++CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS"
+ TERMINFO_LIB_DIRS=
+ if test "x$curses_libraries" != "xNONE"; then
+   LDFLAGS="-L$curses_libraries $LDFLAGS"
+--- ghc-6.12.1/driver/mangler/ghc-asm.lprl.orig	2009-12-10 19:11:33.000000000 +0100
++++ ghc-6.12.1/driver/mangler/ghc-asm.lprl	2010-04-08 17:18:20.029978739 +0200
+@@ -65,7 +65,7 @@
+ $ifile = $ARGV[0];
+ $ofile = $ARGV[1];
+ 
+-if ( $TargetPlatform =~ /^i386-/m ) {
++if ( $TargetPlatform =~ /^i[3456]86-/m ) {
+     if ($ARGV[2] eq '') {
+ 	$StolenX86Regs = 4;
+     } else {
+@@ -134,7 +134,7 @@
+     $T_HDR_vector   = "\t.SPACE \$TEXT\$\n\t.SUBSPA \$CODE\$\n\t\.align 4\n";
+ 
+     #--------------------------------------------------------#
+-    } elsif ( $TargetPlatform =~ /^i386-.*-(linuxaout|freebsd2|nextstep3|cygwin32|mingw32)$/m ) {
++    } elsif ( $TargetPlatform =~ /^i[3456]86-.*-(linuxaout|freebsd2|nextstep3|cygwin32|mingw32)$/m ) {
+ 				# NeXT added but not tested. CaS
+ 
+     $T_STABBY	    = 1; # 1 iff .stab things (usually if a.out format)
+@@ -160,7 +160,7 @@
+     $T_HDR_vector   = "\.text\n\t\.align 4\n"; # NB: requires padding
+ 
+     #--------------------------------------------------------#
+-    } elsif ( $TargetPlatform =~ /^i386-.*-(solaris2|linux|gnu|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu)$/m ) {
++    } elsif ( $TargetPlatform =~ /^i[3456]86-.*-(solaris2|linux|gnu|freebsd|dragonfly|netbsd|openbsd|kfreebsdgnu)$/m ) {
+ 
+     $T_STABBY	    = 0; # 1 iff .stab things (usually if a.out format)
+     $T_US	    = ''; # _ if symbols have an underscore on the front
+@@ -512,7 +512,7 @@
+ print STDERR "T_PRE_APP: $T_PRE_APP\n";
+ print STDERR "T_CONST_LBL: $T_CONST_LBL\n";
+ print STDERR "T_POST_LBL: $T_POST_LBL\n";
+-if ( $TargetPlatform =~ /^i386-/m ) {
++if ( $TargetPlatform =~ /^i[3456]86-/m ) {
+     print STDERR "T_X86_PRE_LLBL_PAT: $T_X86_PRE_LLBL_PAT\n";
+     print STDERR "T_X86_PRE_LLBL: $T_X86_PRE_LLBL\n";
+     print STDERR "T_X86_BADJMP: $T_X86_BADJMP\n";
+@@ -871,7 +871,7 @@
+ 		$p =~ s/\t+$//m;
+ 		$r =~ s/^\s*\n//m;
+ 
+-		if ($TargetPlatform =~ /^i386-/m) {
++		if ($TargetPlatform =~ /^i[3456]86-/m) {
+ 		    if ($p =~ /^\tsubl\s+\$(\d+),\s*\%esp\n/m) {
+ 			if ($1 >= 8192) {
+ 			    die "Error: reserved stack space exceeded!\n  Possible workarounds: compile with -fasm, or try another version of gcc.\n"
+@@ -1101,7 +1101,7 @@
+                 # etail holds code that is after the epilogue in the assembly-code
+                 # layout and should not be filtered as part of the epilogue.
+                 $etail = "";
+-		if ($TargetPlatform =~ /^i386-/m) {
++		if ($TargetPlatform =~ /^i[3456]86-/m) {
+ 		    $e =~ s/^\tret\n//m;
+ 		    $e =~ s/^\tpopl\s+\%edi\n//m;
+ 		    $e =~ s/^\tpopl\s+\%esi\n//m;
+@@ -1253,7 +1253,7 @@
+ 	    #    blah_closure:
+ 	    #		...
+             #
+-	    if ( $TargetPlatform =~ /^(i386|sparc|powerpc)/m && $to_move =~ /${T_COPY_DIRVS}/m ) {
++	    if ( $TargetPlatform =~ /^(i[3456]86|sparc|powerpc)/m && $to_move =~ /${T_COPY_DIRVS}/m ) {
+ 		$j = $i + 1;
+ 		while ( $j < $numchks  && $chk[$j] =~ /$T_CONST_LBL/m) {
+ 			$j++;
+@@ -1714,7 +1714,7 @@
+ 	    s/^\tmovl\s+\$${T_US}(.*),\s*(\%e(ax|cx|si|di))\n\tjmp\s+\*\%r\3/\tjmp\t$T_US$1/gm;
+     }
+ 
+-    if ( $TargetPlatform !~ /^i386-/m 
++    if ( $TargetPlatform !~ /^i[3456]86-/m 
+       || ! /^\t[a-z]/m  # no instructions in here, apparently
+       || /^${T_US}__stginit_[A-Za-z0-9_]+${T_POST_LBL}/m) {
+ 	print OUTASM $_;
+--- ghc-6.12.3/aclocal.m4~	2010-06-09 20:10:08.000000000 +0200
++++ ghc-6.12.3/aclocal.m4	2010-08-20 21:23:11.218919505 +0200
+@@ -1279,7 +1279,7 @@
+   hppa*)
+     $2="hppa"
+     ;;
+-  i386)
++  i386|i486|i586|i686)
+     $2="i386"
+     ;;
+   ia64)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc/ghc-pld.patch?r1=1.9&r2=1.10&f=u