Add fix from upstream for building on ppc64.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 43 insertions, 15 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index d9d46e256048..09fb0477298d 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.198 2014/03/26 05:52:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.199 2014/03/27 01:11:49 vapier Exp $
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/6.0.0a/ppc64-build.diff, gmp-6.0.0a.ebuild:
+  Add fix from upstream for building on ppc64.
 
 *gmp-6.0.0a (26 Mar 2014)
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 72d0e4073788..ff949c8edb74 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 6.0.0a/ppc64-build.diff 668 SHA256 1cef5211efa36956a263b81db2fd2a3af8016942512f76fb67b88328b80c7792 SHA512 ab37e9205da14479b852b932285d16cce02d4c266a3b431d1ad65feabd0e36bdd71da762ee15a783576c6551c080fc212ca27146fb8b8d9c7c77df6aacb7e85e WHIRLPOOL 2f3a3079fa4a7ce73a1ffdbabdc1495b02e6354296eda97b9a4a14045aa934233a62598a8de2d397f404b37252fab28a703a2e709a2c58a716e83e09e690401a
 AUX gmp-4.1.4-noexecstack.patch 474 SHA256 68601777151a1628d7bc839eddd037685c5d2e76c9453166890a5eb3cf6000c3 SHA512 74b8b68061a1a5ac0f8b163974834465e86e930884e1a9cd15c4c948fdae95ffdcbb6e0210d56df6d0dcf1ccbe13dbdfe45552e645c3fdea6454747731b63bc8 WHIRLPOOL d8a0f81d4e97f6996bf68dd3d5488762e221f43a26e1cbff27adb372a40075d35fbb0e956ccd45c8b320a900d284f16d0649293cc907daab45d02cb30e74373b
 AUX gmp-4.2.1-s390.diff 1848 SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec SHA512 ab13186cfdb2a217edb5bd77379d68442685319ec3ca5b9ccadd67a68356f56881ea5feb7dbd40821d6587553d46b63b19ba454a9e3ede27baf72a6857169c44 WHIRLPOOL c2c4727cd1e9a18529ecd44e1d7b2eb758bf0b6f81706024fd271d368ec9f6c0c36ffef352191168d9511a104ab40f51df730c287e03f8acda2ba572079abdf8
 AUX gmp-4.3.2-ABI-multilib.patch 8883 SHA256 772c003810d5f8073e6c2b6fea4ba7dfe38d7f7b14c25995be7d1ee7f45ab59f SHA512 784b90318185a9801b02ef041ce642bb21928fcd3cf8bc9d9e2e6036a68b486a5f7c8ddd7a1460413035b715508ad4eeda18c5b3be434abf1ed4cc72be0c31b6 WHIRLPOOL 193b1d3c5d2dd534a5a01d511adca8dfcddbab91ebee0bfe65e01c6b0fdf99152e2697380638505e8dc3632098ef4d189dbea602a01dec07511976ca0761f528
@@ -48,22 +49,22 @@ EBUILD gmp-5.1.2.ebuild 3018 SHA256 fda5dba2cbbac61c34f22c1c6c8c6b4fc558a2b88435
 EBUILD gmp-5.1.3-r1.ebuild 3142 SHA256 b7f200e37dd1842d0ace983623e38de3e832cc56f4f65779dbaf65c0c925c3c2 SHA512 250b6b1087a9a650fb2b6bce9e462bdf3eda25daa46511bf116d87aedc9d1a68cd6a1b9d63bab8a41f7d3f1d9927faecb060256fd9c3ee0417793833c5f3b780 WHIRLPOOL 4f008f7cb7916b15d44f86680259b8358ac330dd2a29963528036c951ede441b77a9a35174a4c2d8f738186eadbd2c2e2d696386ba0b7bf9c35513c9dbe8c14f
 EBUILD gmp-5.1.3.ebuild 3029 SHA256 12910ced97e935633c036ffc0483cb1be2c8d0d4e9803b712dd1fbab7a87dc94 SHA512 37355b80b3c35307a62b9b8d39a8e34dd91e7b39bbef4fe6647d3bf4b7c111df2f2cbe44170f8b0279867c6f55f87c37117b152e47914730cbaa860f4d1c3285 WHIRLPOOL 610a83227a80b6d64cd3acf417467189924d3b3cf3c01600444daa5e29163f7cd1875b28b598ff4ad9e9c6d886a8630d719cc61dd29e96359fb557591ed9db91
 EBUILD gmp-6.0.0a.ebuild 3094 SHA256 a72499558a79fba150400568c3836ccb04a4a58e3f7efd8d23aee6100a7a8c0f SHA512 1d5e6d8257b5e818c1d30283c3a20c730ce3d7626dec3e1d9e6cdb8b670ad58c1a5f5b6fafee910ea2dc6d50c5413692aa279064a4c14a49ddae96caf4cfb643 WHIRLPOOL 77bb208b3130d602f1e4d37023ec482cbfbce33f8e17238ff7d1114029dd0ccebacd1b2ba031954057b0483f1f0f7d9938cd800b8d78afd2841ff4bd3ba22303
-MISC ChangeLog 26031 SHA256 5969d4175a56626de98445d33e7f247f99647c53fbbd515542a49df24d59850f SHA512 b260ce3bae30e405ac91d4a75b32f80130ad8d35700a2e76dec129dbb0a6dd8458b7e5e336956f8e3e43dceb4c7879d9c06db64c1fd79536b9c8ed35c5cd64ef WHIRLPOOL 67e32e91d0d70813b16ddd9c21637468ec008187138f0d9b40cc8932c5546e5220ca9cf5ee5a27712ba569f6b8842a4b21737093ad51a42d799a113d7b48b405
+MISC ChangeLog 26182 SHA256 84939204e2ec2927135894ab84b7c828a6d9dda5f6ec92034db6764ff1a84d74 SHA512 5af0f9b4907a7b72c3faad5bfa1f65bda8b706a8a9b22ddbaf4b59aba2c553ab6775f90d796d3c3ae09d3cbee836666541652d5a571db104445f53510dd1d8c5 WHIRLPOOL eb6b50b21957914a021895b1224a6a1bb2a410955564021c34d7d8a9b3ecb5c5611c8913e063f990f209bbdc626cf6423a081e8b5a7524211cafeedc40c54437
 MISC metadata.xml 315 SHA256 f6cfb0b2b72dab3e088b68df3d21db3f8463b30571e6de17d1431a57f1bc8d26 SHA512 109d0cbf90eff7264eb6502397024425664d8349229ba334797fcca61852e92ea2c3064579c4765793a69e2811a44ffa63b3091f2ffa5a433dc22ab308a2bcba WHIRLPOOL 3320121476ba2740ee9ee338374cccc853990f229e0cb3a23b5c0ed3e925485f5fd4b797b04ec4ae419eadfc5b9a057dcd9435fe507cca65560e09ad158c1ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMmsNAAoJEPGu1DbS6WIAUWcP/iEjaDKiXUZv3KNCd7UhK58H
-Qartaop09++GcYtWQhCej8UV147RiPuKc10gpoUJv3YiukNaqNT09e9pOFXIvzVg
-t7PUx019A0OL0k9KjOf3UouhisY9qYY0WijAeB2AFYB/WdICJFhE+xIgMz+36PZs
-6ZWw3yNRlvhJ+3HlPHxdknC5FNXh0f1cxeBFmazYEY16aqDF6ZtfbZzLGdiB4WbQ
-wY5RtWDqx1r6DgE+rRICJaJZueQ2Z0Wo3kRv3aafN6x9mo63n3/eJIPkxNKoNirA
-HVGkDVW/xdwPjJsW5a9cQNBh4+k1cZCmNEWmYUVx+VaRgRziZFgE/2y4HJyYJcWV
-tK2l2jgLB0PnoEiI3L0cgX9hCiPdH5cDYjQDTu9Sq/TPXoqCzPd9j8jWjV3ma7UI
-ifr7Pt9tunhuWobZ5H7b+f/Fyhk97WDpuyx7nyj5w6JoRIiH4si/H0R/IeccZkFr
-L+we4rhqbvBFvBd4KRymLZibm7Jsrky//xAKaJxcFx5V3tbroa1Hua+ypLFJ2Ksa
-nGCIt1eNQ2PsLhzUqzmHOkSOi6pKEJzFgPdDlHqzX54AeGI5OBqNIb8KR6UFatug
-agSHyWHZ0zbnmC2wrlqfxTsnnVBdlBQp2DUk5M0/XMrz0ZFfNuTtVnQB0n3pyKFn
-PQoOavtTpqC09h0dB2ng
-=7oNt
+iQIcBAEBCAAGBQJTM3rcAAoJEPGu1DbS6WIAK30QAIfHW3g6pMljrgHTznwpWLkF
+NUBT15UIlHl+LUXZIkPpEVfcN5YUyGdPZ3RPySUvF0LwsLn4t+1WO8lqUds1iNnf
+nGMDqATWSWkpaP7E9pWk+hCyQy9Y9NJinbDvsWO9IXeH5v0rMI9JwPdL7V8lII83
+lRPI7nOtxa4q5V610G5+V1coLe6BhzvSGkpAODeM7ktW0M+WnWxHdAe4kC9jFzul
+LMuSfZgBeOM5Xb5TVpJLlgNA28sRgX7ghK5UKUP5eT2LygxBX7KXlGdgPgb7pfZ+
+Yf2quAgviHr7wipKH7Zzl37DTT83f+w+ix4P6EqAY7LPOv26+fSkeEMOYmTY+x/4
+flqYsVV1BDU2WIo4N6LGP23aFg6zlfD6XDybgFIVS3Xxv0DtpkuMlMrIYdsPwUGw
+9XAqUA3uAWLLQEEmob5MSe1I8BRij7C8zzxVH67WGakhDQib/3xASzBUH70o2v3a
+9rHp7RxxkXYteNGnKV9QuOyTSObqBKdzV1316q9Xz6V+hW9SZQ3EVhm+zqm+bi34
+5hGAAWviEX5FQQQfdR8Tpgki64v34kXnztXi9c0tl9SF5fhdHzEkPubRmiZyNh5B
+JDVs+BZ8xTGsVIy1tsVsZtdpupuRV6aropbMnf1KjZfQs+9EguYCvFlNYhbPYZeJ
+NXz9FhYWfTcdpuBtFRBV
+=PO9n
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/6.0.0a/ppc64-build.diff b/dev-libs/gmp/files/6.0.0a/ppc64-build.diff
new file mode 100644
index 000000000000..4d0ec5efcb83
--- /dev/null
+++ b/dev-libs/gmp/files/6.0.0a/ppc64-build.diff
@@ -0,0 +1,23 @@
+from upstream
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1395835068 -3600
+# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7
+# Parent  301ce2788826a2d4d2725bd5cf01e998638db37a
+Provide default for BMOD_1_TO_MOD_1_THRESHOLD.
+
+diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm
+--- a/mpn/powerpc64/mode64/gcd_1.asm	Tue Mar 25 15:34:52 2014 +0100
++++ b/mpn/powerpc64/mode64/gcd_1.asm	Wed Mar 26 12:57:48 2014 +0100
+@@ -43,6 +43,9 @@
+ define(`n',     `r4')
+ define(`v0',    `r5')
+ 
++ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',,
++  `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)')
++
+ EXTERN_FUNC(mpn_mod_1)
+ EXTERN_FUNC(mpn_modexact_1c_odd)
+ 
+