Steal patch from debian to make it compile on armv6/armv7

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 91 insertions, 5 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 1c22a80b8846..74a13d134176 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.85 2009/10/30 12:57:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.86 2009/12/10 17:19:26 armin76 Exp $
+
+  10 Dec 2009; Raúl Porcel <armin76@gentoo.org> libffi-3.0.8.ebuild,
+  +files/libffi-3.0.8-arm.patch:
+  Steal patch from debian to make it compile on armv6/armv7
 
 *libffi-3.0.9_rc3 (30 Oct 2009)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 554a03af7845..6a6b2ee8bfe3 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,8 +1,9 @@
+AUX libffi-3.0.8-arm.patch 1840 RMD160 2a437a9f900a34e9b7438898f97864c811d87957 SHA1 e9cb79b4b508533c096ac2b2636a91bd11a562b4 SHA256 d3c73acb96f9b46491b8f085e73b14d8c6cde7760538ff133e178ebbc1b574fd
 AUX libffi-3.0.8-autoconf-2.64.patch 370 RMD160 4d92f991d6b9ab0b965f310dcd3836c265e52db3 SHA1 9ecb24c97b24cdb2ba0c4e07d339f0826ae0fb53 SHA256 ee184a3830735cf20249279f4929498af6004f89f3dd720cd4cdb1c272917e98
 AUX libffi-3.0.8-fbsd.patch 866 RMD160 ac8c5a157bf3faf5d54ef2bab8822cec5656aaef SHA1 d460fd0a55365f0b4befbdb2c2259399dd875e44 SHA256 5c50d84ba3e6312c046efa5ac8bed0c6b9b719ae98196f7841511f62dccb568d
 DIST libffi-3.0.8.tar.gz 722834 RMD160 4144f64e79ebf95161a6afd58ceaeef8372b5e57 SHA1 ce44d10c39d9a37479c8777e206cac0f36c48712 SHA256 2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
 DIST libffi-3.0.9rc3.tar.gz 693589 RMD160 4fbbed22efaa96d8df5929469f1caf874cd17cb8 SHA1 9b4a1f3c8aca9b1e296f1a943c302e6a6b09405a SHA256 3bc2f7700283e35436e6292946c5f29c8f710b9d0f1b0fe2677c23112385c73a
-EBUILD libffi-3.0.8.ebuild 1007 RMD160 bdc64fc216ecca8edfb5d85b7f19ff32ce0ca7a2 SHA1 b37b72ef25bd753f4010c83056ac39b9d2648dbe SHA256 06042b4b5368e78ee361b6cdcf916a9e307f90d23898ba4a1e9782c2ba57c464
+EBUILD libffi-3.0.8.ebuild 1041 RMD160 e80cfd9025ae824333bd8047f7ab201dd2314ef2 SHA1 9ec521fa6b62c0c943437e3e6139cd2bd95fb8aa SHA256 6d4b33f4d5edabfeb60e3ca87a708d5a2d4dd93f2b2e98fb5a6fe23647b2cec7
 EBUILD libffi-3.0.9_rc3.ebuild 838 RMD160 5412e1d60148b0d79a26068da2faa97b659be15a SHA1 701478b1f9c9359be829fd2335b7c18e2cae2ada SHA256 6021a258ea6d6fe01a8e07bdeaf10531f1ca51bba797f6f3a7280c69b97111e7
-MISC ChangeLog 11772 RMD160 84e971733869188128ee5592d79f33ea4df41fa9 SHA1 d8f5d7cdf19a1d8387ebd560b855259e4e49f896 SHA256 259ccb6e9d59f93f44313aab690abb06281da25d193d59e6b480b87e718c8279
+MISC ChangeLog 11934 RMD160 96d4f9e570b6ba6ef47cbc7c01b35a35236ee912 SHA1 cfa0fff62b6cffde41d5f36dc8fcfe63575b9d4b SHA256 182b9246713e1a755a9dc828fe98c1bb1ad7823b14fe532e3a5d556bcc91aa8b
 MISC metadata.xml 1761 RMD160 c6d44282237252575e5f648797c963555b019c0a SHA1 d036b0d8abfee3c87e07dd4b631952c6fe4e2d02 SHA256 a3f4cbcf148c89db193d4e9b1c7db706a7fbbfeebf7576c15e3eeb0722c21776
diff --git a/dev-libs/libffi/files/libffi-3.0.8-arm.patch b/dev-libs/libffi/files/libffi-3.0.8-arm.patch
new file mode 100644
index 000000000000..57cc8fdd2797
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.8-arm.patch
@@ -0,0 +1,80 @@
+--- libffi-3.0.7.orig/src/arm/sysv.S
++++ libffi-3.0.7/src/arm/sysv.S
+@@ -67,11 +67,18 @@
+ 
+ #if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+         || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
+-        || defined(__ARM_ARCH_6ZK__)
++        || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
++	|| defined(__ARM_ARCH_6M__)
+ # undef __ARM_ARCH__
+ # define __ARM_ARCH__ 6
+ #endif
+ 
++#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
++        || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
++# undef __ARM_ARCH__
++# define __ARM_ARCH__ 7
++#endif
++
+ #if __ARM_ARCH__ >= 5
+ # define call_reg(x)	blx	x
+ #elif defined (__ARM_ARCH_4T__)
+@@ -189,7 +196,7 @@
+ 
+ @ return INT
+ 	cmp	r3, #FFI_TYPE_INT
+-#ifdef __SOFTFP__
++#if defined(__SOFTFP__) || defined(__ARM_EABI__)
+ 	cmpne	r3, #FFI_TYPE_FLOAT
+ #endif
+ 	streq	r0, [r2]
+@@ -197,12 +204,12 @@
+ 
+ 	@ return INT64
+ 	cmp	r3, #FFI_TYPE_SINT64
+-#ifdef __SOFTFP__
++#if defined(__SOFTFP__) || defined(__ARM_EABI__)
+ 	cmpne	r3, #FFI_TYPE_DOUBLE
+ #endif
+ 	stmeqia	r2, {r0, r1}
+ 
+-#ifndef __SOFTFP__
++#if !defined(__SOFTFP__) && !defined(__ARM_EABI__)
+ 	beq	LSYM(Lepilogue)
+ 
+ @ return FLOAT
+@@ -245,21 +252,21 @@
+ 	beq	.Lretint
+ 
+ 	cmp	r0, #FFI_TYPE_FLOAT
+-#ifdef __SOFTFP__
++#if defined(__SOFTFP__) || defined(__ARM_EABI__)
+ 	beq	.Lretint
+ #else
+ 	beq	.Lretfloat
+ #endif
+ 
+ 	cmp	r0, #FFI_TYPE_DOUBLE
+-#ifdef __SOFTFP__
++#if defined(__SOFTFP__) || defined(__ARM_EABI__)
+ 	beq	.Lretlonglong
+ #else
+ 	beq	.Lretdouble
+ #endif
+ 
+ 	cmp	r0, #FFI_TYPE_LONGDOUBLE
+-#ifdef __SOFTFP__
++#if defined(__SOFTFP__) || defined(__ARM_EABI__)
+ 	beq	.Lretlonglong
+ #else
+ 	beq	.Lretlongdouble
+@@ -278,7 +285,7 @@
+ 	ldr	r1, [sp, #4]
+ 	b	.Lclosure_epilogue
+ 
+-#ifndef __SOFTFP__
++#if !defined(__SOFTFP__) && !defined(__ARM_EABI__)
+ .Lretfloat:
+ 	ldfs	f0, [sp]
+ 	b	.Lclosure_epilogue
diff --git a/dev-libs/libffi/libffi-3.0.8.ebuild b/dev-libs/libffi/libffi-3.0.8.ebuild
index 5e510139843f..37424486d508 100644
--- a/dev-libs/libffi/libffi-3.0.8.ebuild
+++ b/dev-libs/libffi/libffi-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.23 2009/10/19 21:20:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.24 2009/12/10 17:19:26 armin76 Exp $
 
 inherit autotools eutils
 
@@ -21,7 +21,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-autoconf-2.64.patch
+		"${FILESDIR}"/${P}-autoconf-2.64.patch \
+		"${FILESDIR}"/${P}-arm.patch
 	eautoreconf
 }