Add fmccor's sparc mangler patch. Fixes bug #144752.

Package-Manager: portage-2.1.1-r1

4 files changed, 35 insertions, 13 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 93721a56e340..5621ec473fcc 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.113 2006/10/03 23:15:54 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.114 2006/10/03 23:42:18 dcoutts Exp $
+
+  03 Oct 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/ghc-6.4.2-sparcmangler.patch, ghc-6.4.2.ebuild:
+  Add fmccor's sparc mangler patch. Fixes bug #144752.
 
   03 Oct 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r3.ebuild,
   ghc-6.4.2.ebuild:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 136b6a820a50..bf1b24826e11 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -25,6 +25,10 @@ AUX ghc-6.4.2-sparc32plus.patch 526 RMD160 970d062362284659c2570394c8f9328d8096e
 MD5 bb39f157030944685ae41d24622a2cb3 files/ghc-6.4.2-sparc32plus.patch 526
 RMD160 970d062362284659c2570394c8f9328d8096ea8e files/ghc-6.4.2-sparc32plus.patch 526
 SHA256 a05bd16c9308ec9f608aeabe0ea35e2dff6826f262108d1ccb16c4f93a2d3a44 files/ghc-6.4.2-sparc32plus.patch 526
+AUX ghc-6.4.2-sparcmangler.patch 837 RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 SHA1 5faccb311239c4c4d07a2c6dc507d51a18c2bc96 SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af
+MD5 c42b26cfaf5469b236c345e1614370cc files/ghc-6.4.2-sparcmangler.patch 837
+RMD160 7e3a2a94bb62c3c0da09f08096481cace2b1bb96 files/ghc-6.4.2-sparcmangler.patch 837
+SHA256 3987724420c6d4b552c6fbb3b3ca10fca8aaa73573735aa3de824d3dc65f94af files/ghc-6.4.2-sparcmangler.patch 837
 AUX ghc-updater 9045 RMD160 b044a26add18464b583702f3cac667521c5eb06f SHA1 f5ccd2bf9f78f895368a1ff64ceddd5703f1d13b SHA256 eafc2eb58a9c1ad0263fd498cad00f50b0d04860cd8e26aa201910f77d74efbe
 MD5 e7ba0887c43fd8333a4d1bd92c184244 files/ghc-updater 9045
 RMD160 b044a26add18464b583702f3cac667521c5eb06f files/ghc-updater 9045
@@ -46,14 +50,14 @@ EBUILD ghc-6.4.1-r3.ebuild 9882 RMD160 d9cec28975a8414443cca23eb5269fcf2e2a5294
 MD5 bde3a42be56f37a84b7dda4b0cda5658 ghc-6.4.1-r3.ebuild 9882
 RMD160 d9cec28975a8414443cca23eb5269fcf2e2a5294 ghc-6.4.1-r3.ebuild 9882
 SHA256 8325c07e312cb18f52f7ed3338b6cf5ec53f4994a3ab5d4938c9b5a39c702f8d ghc-6.4.1-r3.ebuild 9882
-EBUILD ghc-6.4.2.ebuild 10735 RMD160 608d71e94dae70544c4e753ea53f8618bec2602d SHA1 5445f5a3aacd819ee3df24b0baca5405f011c621 SHA256 a414b3e6cd109c70741c064d2230ac1b677c24a09db094be0cb52ea4719ebadf
-MD5 0cd3778cee0b572b4ce7ac647526b613 ghc-6.4.2.ebuild 10735
-RMD160 608d71e94dae70544c4e753ea53f8618bec2602d ghc-6.4.2.ebuild 10735
-SHA256 a414b3e6cd109c70741c064d2230ac1b677c24a09db094be0cb52ea4719ebadf ghc-6.4.2.ebuild 10735
-MISC ChangeLog 19735 RMD160 05d06a07c8b1206cf684b313141ad1ae7f98326a SHA1 07d059672a4d47b6e56617e4971a42c33e231a46 SHA256 1b2ab3742f02e39d139ea4e5d442486dee6c22d8b4b38be5acbc1b171a0bb593
-MD5 2e92b6b7f2b8f68405dcd5b68f03c69b ChangeLog 19735
-RMD160 05d06a07c8b1206cf684b313141ad1ae7f98326a ChangeLog 19735
-SHA256 1b2ab3742f02e39d139ea4e5d442486dee6c22d8b4b38be5acbc1b171a0bb593 ChangeLog 19735
+EBUILD ghc-6.4.2.ebuild 10781 RMD160 25cf8d5b7fb430bd896864c98b3199ab2b47f7dc SHA1 e2b8399c511df34e3858db88d73fa17fa961c6ee SHA256 de8f09fff748f9f67d4f635d6ba1f5e6ca0b8381de88cd343232362629222a86
+MD5 cc4b6937b692848ae65d3278e00bc3e7 ghc-6.4.2.ebuild 10781
+RMD160 25cf8d5b7fb430bd896864c98b3199ab2b47f7dc ghc-6.4.2.ebuild 10781
+SHA256 de8f09fff748f9f67d4f635d6ba1f5e6ca0b8381de88cd343232362629222a86 ghc-6.4.2.ebuild 10781
+MISC ChangeLog 19898 RMD160 bfdc682caba8838076783731e2ec62968dcb0fde SHA1 4678011ddb27b4f3c2e3353eec9f101dfb6f99ac SHA256 e0a6153587b52293f35e76adfab770b57defd8c0dbe473a9bd59812058ee6532
+MD5 f3fc8f0fbd90209d6446bc52615ac9ce ChangeLog 19898
+RMD160 bfdc682caba8838076783731e2ec62968dcb0fde ChangeLog 19898
+SHA256 e0a6153587b52293f35e76adfab770b57defd8c0dbe473a9bd59812058ee6532 ChangeLog 19898
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -73,7 +77,7 @@ SHA256 84f4b6adad832de57cc219499590df79b6be7ac5c96ec975e15aa37370269d40 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFIu7hnUVyUObPUL4RAvxVAJ9Exfp2Eq3m7V5d0T74DreVpIq/hgCeOum1
-PVLmQQuaGAH1xFS9oltL3z8=
-=lVDO
+iD8DBQFFIvVMnUVyUObPUL4RAl32AJ0evbO/iD4S5c7ubyfEbLm2AA1NGQCeOxMk
+aVszS+uGAiMuBrhrpFvQfdQ=
+=ndwP
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-6.4.2-sparcmangler.patch b/dev-lang/ghc/files/ghc-6.4.2-sparcmangler.patch
new file mode 100644
index 000000000000..7431ffb5a5fe
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-6.4.2-sparcmangler.patch
@@ -0,0 +1,13 @@
+--- ghc/driver/mangler/ghc-asm.lprl-	2006-08-23 14:24:27.000000000 +0000
++++ ghc/driver/mangler/ghc-asm.lprl	2006-08-23 14:25:46.000000000 +0000
+@@ -417,8 +417,8 @@
+     $T_CONST_LBL    = '^\.LLC(\d+):$'; # regexp for what such a lbl looks like
+     $T_POST_LBL     = ':';
+ 
+-    $T_MOVE_DIRVS   = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\.text|\.data|\.seg|\.stab.*|\s+?\.section.*|\s+\.type.*|\s+\.size.*)\n)';
+-    $T_COPY_DIRVS   = '\.(global|globl|proc|stab)';
++    $T_MOVE_DIRVS   = '^((\s+\.align\s+\d+|\s+\.proc\s+\d+|\s+\.global\s+\S+|\s+\.local\s+\S+|\.text|\.data|\.seg|\.stab.*|\s+?\.section.*|\s+\.type.*|\s+\.size.*)\n)';
++    $T_COPY_DIRVS   = '\.(global|local|globl|proc|stab)';
+ 
+     $T_DOT_WORD     = '\.(long|word|nword|xword|byte|half|short|skip|uahalf|uaword)';
+     $T_DOT_GLOBAL   = '^\t\.global';
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index ebddee204d31..963a2a1d446a 100644
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.15 2006/10/03 23:15:54 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.16 2006/10/03 23:42:18 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -161,6 +161,7 @@ src_unpack() {
 	cd ${S}
 	epatch "${WORKDIR}/${P}-alut.patch"
 	epatch "${FILESDIR}/${P}-sparc32plus.patch"
+	epatch "${FILESDIR}/${P}-sparcmangler.patch"
 
 	# Modify the ghc driver script to use GHC_CFLAGS
 	echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile"