Add fix for x32 ABIs.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 78 insertions, 9 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index 635255a28701..68ae6bbd256e 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libaio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.60 2011/10/03 16:55:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.61 2011/12/07 15:45:57 vapier Exp $
+
+  07 Dec 2011; Mike Frysinger <vapier@gentoo.org> libaio-0.3.109-r2.ebuild,
+  +files/libaio-0.3.109-x32.patch:
+  Add fix for x32 ABIs.
 
   03 Oct 2011; Joseph Jezak <josejx@gentoo.org> libaio-0.3.109-r2.ebuild:
   Marked ppc/ppc64 stable for bug #379991.
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index d2400d0c6d32..0f487e744a8e 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libaio-0.3.106-build.patch 897 RMD160 59f63ebec2b753b114dd0a2e600faa55346b53f4 SHA1 b43f7c37de4918f14ea944aaee415fb710a443b9 SHA256 bea61cfeff24fb2fd37dd4dffc3dbe4ce98f32ddccb20f6462cf62ba16eaeee3
 AUX libaio-0.3.107-ar-ranlib.patch 398 RMD160 f947850b92889f03c97bfc1d6704bf145be47ad5 SHA1 e7ef3531f21cef45a0d44aab936d8b3da97e8f37 SHA256 08f00e00cef21df01ec7327b1789083ea0d93b86b211a7164f1f1926ecde301f
@@ -9,17 +9,18 @@ AUX libaio-0.3.107-sparc.patch 5331 RMD160 f265fe93f6c1fee7201a168b21cd3dfb00a33
 AUX libaio-0.3.109-generic-arch.patch 2047 RMD160 5a89b6864672a1cefecd4ba2408dccf6f394ac19 SHA1 4329c5276b416f1575080117e913d4e7eb27af49 SHA256 f1bd745d3e6fe42f8a0ab811a4925b9bbdb827d338cf1cf1cf44583951f5abda
 AUX libaio-0.3.109-install.patch 1506 RMD160 0cc96314ee891d24161ea604239c202723ea61d8 SHA1 e3ad797525ce251e2b8dcec8fba1aa6fa1b39e9a SHA256 6d4b429bd3f29bf3748256943ee1a7cbb4cb6d9b3af63b2a9ee0be913783e34e
 AUX libaio-0.3.109-unify-bits-endian.patch 2610 RMD160 d22a312b8bec3faf39077e3145f6a89647188be7 SHA1 a275af96cfaaab2723ed0a187cc39a21db696ca3 SHA256 53c10fda429b47fc2fbbbf3751285a39523b8f8bdae9366294569055bd088f92
+AUX libaio-0.3.109-x32.patch 2122 RMD160 60bf4ae3dccd8ba8a480a3002a03a7330d883ef3 SHA1 07ba91cb26d972a4d0dd720821fa2ab176e7692a SHA256 23a4c40e8add0125ebb9f50919ff27f55de0e2605ca7800bc875e0e81a936974
 DIST libaio-0.3.107.tar.gz 51540 RMD160 b1b09ec4c277a4322917493cfe6a7e532eb66032 SHA1 769a541744448a6dfc3fd3a3e335afe7aa77ca8e SHA256 e6ad9246d7cd615d90fb3d231eec94111a36a85e9ffc759ac6bdab1a03995f27
 DIST libaio-0.3.109.tar.bz2 43579 RMD160 fed1f4ddb9cb9d66c40f5909a6d7c2400dcebda0 SHA1 b772e567e7089bb3ca405b16370f8b1a4997c0b3 SHA256 b5cefce0a3cb49f8dca4d00e9480c0d9b45b75863bd44764156e322ee214e794
 EBUILD libaio-0.3.107.ebuild 1511 RMD160 54bffb7552c3d806075acbbebc0481816b232cd7 SHA1 27ce5a8c02185860744cc3e7cd35af85c87fac57 SHA256 6b2df4e5454e04f71a630cb24c948031a01914a13eefa4ae6b476d3251a6efdb
 EBUILD libaio-0.3.109-r1.ebuild 1596 RMD160 f524720377ead44e1bfcf6481fc83bcb88de05fd SHA1 da6a03dc53e74815cd1c7f963d08f9fbfc762cc9 SHA256 dc8b6582152eee085c575cb7d4a8c69a680be9cf1c59c0ebef70bc94273af027
-EBUILD libaio-0.3.109-r2.ebuild 1738 RMD160 acc5f9a0351d836304c70f8ff6acc32bf33f9959 SHA1 89fa46412ce7d3fb7109b8b1572d5db1453f05be SHA256 b15aa695969594aa55257a100cccf2d757fc2a2ec5b93045cba9acca12cb4dd6
-MISC ChangeLog 8208 RMD160 9207344371e97908dedeeb2e09c10e88d470ab35 SHA1 6f71e23dc734ec0b1b9de0b463361cbbdc60d2b9 SHA256 8754fb3c79ffc314d1bf16b5c6c9d63ee9dd3856925c1c0ac66047d16801f9f0
+EBUILD libaio-0.3.109-r2.ebuild 1784 RMD160 5698afa9d0d19d19afd9d7a2efb06d2912561097 SHA1 f4269428324c60a3f45093bbcca2c5d7541abbee SHA256 0fd9d7e7f5bcc91a693c761952b512c9d8811d41c2afa2c1c18dd0528a6e1958
+MISC ChangeLog 8344 RMD160 1da67d178fd7ee551bd81c860ce0be486f486383 SHA1 8ef37d2483d5c96d41f254933da0eb902bc510f6 SHA256 5be75f0e0701af87421d99f35b85b778b0787e904ae5aac477ff58ce0faeb517
 MISC metadata.xml 414 RMD160 729568392408a479b1c7dd127c8c158afdfffb77 SHA1 212f6c187d77b0a44db05f5eee1bcc802592bad7 SHA256 06f23f3cae96ee5bdfa7925483540566826c2756d62431921c27f70928bd8d19
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6J6QcACgkQcsIHjyDViGTlSQCfRPQ7SYBqfFanRyL91CBm1X3k
-52oAn0f+Yt9nEnZ4xrQZpIrhMagvXFoC
-=m17K
+iF4EAREIAAYFAk7fij4ACgkQaC/OocHi7JblMgEAmmMfe7ttqoDaBybJcwxhSfRv
+Fru6rdB+I2Jcs2IjnkMA/R9xW9tV9z3cp+6bfZcjlrCPvbxWlArKdUWDv5BfnoQ7
+=BGcs
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
new file mode 100644
index 000000000000..1d2c2a9050fa
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
@@ -0,0 +1,63 @@
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826
+
+Upstream-Status: Pending
+
+Properly load arguments 5 an 6 for x86-64 syscall
+Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
+syscall so that it works with both x32 and x86-64.
+
+Received this patch from H.J. Lu <hjl.tools@gmail.com>
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/12/02
+
+--- libaio-0.3.109/src/syscall-x86_64.h.x32	2009-10-09 11:17:02.000000000 -0700
++++ libaio-0.3.109/src/syscall-x86_64.h	2011-12-02 09:09:07.537603224 -0800
+@@ -1,8 +1,18 @@
++#ifndef __NR_io_setup
+ #define __NR_io_setup		206
++#endif
++#ifndef __NR_io_destroy
+ #define __NR_io_destroy		207
++#endif
++#ifndef __NR_io_getevents
+ #define __NR_io_getevents	208
++#endif
++#ifndef __NR_io_submit
+ #define __NR_io_submit		209
++#endif
++#ifndef __NR_io_cancel
+ #define __NR_io_cancel		210
++#endif
+ 
+ #define __syscall_clobber "r11","rcx","memory" 
+ #define __syscall "syscall"
+@@ -42,10 +52,11 @@ return __res;								\
+ type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
+ {									\
+ long __res;								\
+-__asm__ volatile ("movq %5,%%r10 ;" __syscall				\
++register long __a4 asm ("r10") = (long) arg4;				\
++__asm__ volatile (__syscall						\
+ 	: "=a" (__res)							\
+ 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
+-	  "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
++	  "d" ((long)(arg3)),"r" (__a4)); \
+ return __res;								\
+ } 
+ 
+@@ -54,10 +65,11 @@ return __res;								\
+ type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
+ {									\
+ long __res;								\
+-__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall		\
++register long __a4 asm ("r10") = (long) arg4;				\
++register long __a5 asm ("r8") = (long) arg5;				\
++__asm__ volatile ( __syscall						\
+ 	: "=a" (__res)							\
+ 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
+-	  "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) :	\
+-	__syscall_clobber,"r8","r10" );					\
++	  "d" ((long)(arg3)),"r" (__a4),"r" (__a5));			\
+ return __res;								\
+ }
diff --git a/dev-libs/libaio/libaio-0.3.109-r2.ebuild b/dev-libs/libaio/libaio-0.3.109-r2.ebuild
index a30499a4f962..b210dceb3fdd 100644
--- a/dev-libs/libaio/libaio-0.3.109-r2.ebuild
+++ b/dev-libs/libaio/libaio-0.3.109-r2.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-libs/libaio/libaio-0.3.109-r2.ebuild,v 1.8 2011/10/03 16:55:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r2.ebuild,v 1.9 2011/12/07 15:45:57 vapier Exp $
 
 EAPI="3"
 
@@ -23,6 +23,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.3.106-build.patch
 	epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch
 	epatch "${FILESDIR}"/${PN}-0.3.109-install.patch
+	epatch "${FILESDIR}"/${PN}-0.3.109-x32.patch
 	sed -i \
 		-e "/^libdir=/s:lib$:$(get_libdir):" \
 		-e "/^prefix=/s:/usr:${EPREFIX}/usr:" \