Fix Ma2Asm PlLong calls on ppc. Reported by Laurent G. in bug #373881

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 127 insertions, 2 deletions

diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog
index b82a59305fb3..c1c336a759b6 100644
--- a/dev-lang/gprolog/ChangeLog
+++ b/dev-lang/gprolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gprolog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.47 2011/07/01 20:33:45 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.48 2011/07/05 07:47:32 keri Exp $
+
+  05 Jul 2011; <keri@gentoo.org> gprolog-1.4.0.ebuild,
+  +files/gprolog-1.4.0-ma2asm-pllong.patch:
+  Fix Ma2Asm PlLong calls on ppc. Reported by Laurent G. in bug #373881
 
   01 Jul 2011; <keri@gentoo.org> gprolog-1.4.0.ebuild,
   +files/gprolog-1.4.0-nodocs.patch:
diff --git a/dev-lang/gprolog/files/gprolog-1.4.0-ma2asm-pllong.patch b/dev-lang/gprolog/files/gprolog-1.4.0-ma2asm-pllong.patch
new file mode 100644
index 000000000000..96e02d00dc39
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-ma2asm-pllong.patch
@@ -0,0 +1,120 @@
+diff -ur gprolog-1.4.0.orig/src/Ma2Asm/alpha_any.c gprolog-1.4.0/src/Ma2Asm/alpha_any.c
+--- gprolog-1.4.0.orig/src/Ma2Asm/alpha_any.c	2011-03-29 05:20:05.000000000 +1300
++++ gprolog-1.4.0/src/Ma2Asm/alpha_any.c	2011-07-05 19:38:52.000000000 +1200
+@@ -870,7 +870,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ int
+-Call_C_Arg_Int(int offset, long int_val)
++Call_C_Arg_Int(int offset, PlLong int_val)
+ {
+   switch (offset)
+     {
+@@ -1433,7 +1433,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Cmp_Ret_And_Int(long int_val)
++Cmp_Ret_And_Int(PlLong int_val)
+ {
+   Inst_Printf("lda", "$1,%ld", int_val);
+   Inst_Printf("subq", "$0,$1,$1");
+@@ -1551,7 +1551,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Dico_Long(char *name, int global, VType vtype, long value)
++Dico_Long(char *name, int global, VType vtype, PlLong value)
+ {
+   switch (vtype)
+     {
+diff -ur gprolog-1.4.0.orig/src/Ma2Asm/mips_irix.c gprolog-1.4.0/src/Ma2Asm/mips_irix.c
+--- gprolog-1.4.0.orig/src/Ma2Asm/mips_irix.c	2011-03-29 05:20:05.000000000 +1300
++++ gprolog-1.4.0/src/Ma2Asm/mips_irix.c	2011-07-05 19:39:30.000000000 +1200
+@@ -510,7 +510,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ int
+-Call_C_Arg_Int(int offset, long int_val)
++Call_C_Arg_Int(int offset, PlLong int_val)
+ {
+   switch (offset)
+     {
+@@ -1125,7 +1125,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Cmp_Ret_And_Int(long int_val)
++Cmp_Ret_And_Int(PlLong int_val)
+ {
+   Inst_Printf("li", "$24,%d", int_val);
+   Inst_Printf("sub", "$12,$2,$24");	/* $2 - $24 -> $12 */
+@@ -1238,7 +1238,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Dico_Long(char *name, int global, VType vtype, long value)
++Dico_Long(char *name, int global, VType vtype, PlLong value)
+ {
+   switch (vtype)
+     {
+diff -ur gprolog-1.4.0.orig/src/Ma2Asm/powerpc_any.c gprolog-1.4.0/src/Ma2Asm/powerpc_any.c
+--- gprolog-1.4.0.orig/src/Ma2Asm/powerpc_any.c	2011-03-29 05:20:05.000000000 +1300
++++ gprolog-1.4.0/src/Ma2Asm/powerpc_any.c	2011-07-05 19:17:16.000000000 +1200
+@@ -500,7 +500,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ int
+-Call_C_Arg_Int(int offset, long int_val)
++Call_C_Arg_Int(int offset, PlLong int_val)
+ {
+   BEFORE_ARG;
+ 
+@@ -835,7 +835,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Cmp_Ret_And_Int(long int_val)
++Cmp_Ret_And_Int(PlLong int_val)
+ {
+   if (LITTLE_INT(int_val))
+     Inst_Printf("cmpwi", CR(1) "," R(3) ",%ld", int_val);
+@@ -958,7 +958,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Dico_Long(char *name, int global, VType vtype, long value)
++Dico_Long(char *name, int global, VType vtype, PlLong value)
+ {
+   switch (vtype)
+     {
+diff -ur gprolog-1.4.0.orig/src/Ma2Asm/sparc_any.c gprolog-1.4.0/src/Ma2Asm/sparc_any.c
+--- gprolog-1.4.0.orig/src/Ma2Asm/sparc_any.c	2011-03-29 05:20:05.000000000 +1300
++++ gprolog-1.4.0/src/Ma2Asm/sparc_any.c	2011-07-05 19:18:29.000000000 +1200
+@@ -449,7 +449,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ int
+-Call_C_Arg_Int(int offset, long int_val)
++Call_C_Arg_Int(int offset, PlLong int_val)
+ {
+   BEFORE_ARG;
+ 
+@@ -792,7 +792,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Cmp_Ret_And_Int(long int_val)
++Cmp_Ret_And_Int(PlLong int_val)
+ {
+   if (LITTLE_INT(int_val))
+     Inst_Printf("cmp", "%%o0,%ld", int_val);
+@@ -912,7 +912,7 @@
+  *                                                                         *
+  *-------------------------------------------------------------------------*/
+ void
+-Dico_Long(char *name, int global, VType vtype, long value)
++Dico_Long(char *name, int global, VType vtype, PlLong value)
+ {
+ 
+   switch (vtype)
diff --git a/dev-lang/gprolog/gprolog-1.4.0.ebuild b/dev-lang/gprolog/gprolog-1.4.0.ebuild
index 951a47291a77..66ed132aeab7 100644
--- a/dev-lang/gprolog/gprolog-1.4.0.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.3 2011/07/01 20:33:45 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.4 2011/07/05 07:47:32 keri Exp $
 
 EAPI=2
 
@@ -21,6 +21,7 @@ RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-ma2asm-pllong.patch
 	epatch "${FILESDIR}"/${P}-nodocs.patch
 	epatch "${FILESDIR}"/${P}-txt-file.patch
 }