#66780

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 389de00858389334a3b7beabda6f8d2a57b445b6..54d4eb3a4186bc17dddd041a3beef3f763a9687e 100644 (file)
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.41 2004/11/07 09:47:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.42 2004/11/28 11:13:49 blubb Exp $
+
+  28 Nov 2004; Simon Stelling <blubb@gentoo.org> +files/amd64.patch,
+  gmp-4.1.4.ebuild:
+  added Patrick McLean's (chutzpah@videotron.ca) patch to fix -O3 and higher
+  issues; bug #66780
 
   07 Nov 2004; Joshua Kinard <kumba@gentoo.org> gmp-4.1.4.ebuild:
   Marked stable on mips.

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 7ba92e4a425bf3c1cb74c2b44e00073e99a29295..c3ba260a67c6ebf9fa75034cc4f93990b3abd74d 100644 (file)
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,11 +1,12 @@
-MD5 2fce90b6a0755fb51147ea2d5a601595 ChangeLog 5655
+MD5 0a0d10f1da29715ca8ceb7410aa0470b ChangeLog 5843
 MD5 d22540aebff95404322039a0d529dab1 gmp-4.1.2.ebuild 1440
 MD5 b48deba3a8676a2678dc947ff68f3b44 gmp-4.1.3.ebuild 1843
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 ffd3347ae1b647bb1ebe9bf2f11bf913 gmp-4.1.4.ebuild 1843
-MD5 8c7f521cf77fb56ab019223cf92a6bca files/digest-gmp-4.1.4 62
+MD5 8b1067969eb47035c29140d347176bae gmp-4.1.4.ebuild 1933
 MD5 265f53218c05ee4ac1192b1fee5d5038 files/digest-gmp-4.1.2 62
 MD5 5e16de635136241e3ca3d414a8e1d181 files/digest-gmp-4.1.3 62
+MD5 8c7f521cf77fb56ab019223cf92a6bca files/digest-gmp-4.1.4 62
 MD5 d646f32e97b41529d4ab5066c69bc856 files/longlong.patch 473
 MD5 d70b080c2f0efd82a800ba8a1af7b305 files/ppc64-gmp-acinclude.patch 474
 MD5 8458ecf3c3c6b27f949d1b1c1e6a9cc7 files/randraw.c.41.diff 585
+MD5 1dbc1772df649dae89ad8e00042c5b46 files/amd64.patch 1166

diff --git a/dev-libs/gmp/files/amd64.patch b/dev-libs/gmp/files/amd64.patch
new file mode 100644 (file)
index 0000000..a07d72c
--- /dev/null
+++ b/dev-libs/gmp/files/amd64.patch
@@ -0,0 +1,30 @@
+--- gmp-impl.h 22 Apr 2004 23:59:53 -0000      1.281.2.12
++++ gmp-impl.h 29 Sep 2004 19:22:23 -0000
+@@ -2188,14 +2188,24 @@
+    there's an even number.  */
+ 
+ #if defined (__GNUC__) && ! defined (NO_ASM) && HAVE_HOST_CPU_FAMILY_x86
++/* Some clever GCC maintainer decided to change the meaning of the q register
++   flag with GCC version 3.1.  He added a Q flag with the old meaning at the
++   same time.  This forces us to use a conditional on GCC version.  */
++#if __GMP_GNUC_PREREQ (3,1)
++#define __GMP_qm "=Qm"
++#define __GMP_q "=Q"
++#else
++#define __GMP_qm "=qm"
++#define __GMP_q "=q"
++#endif
+ #define ULONG_PARITY(p, n)              \
+   do {                                  \
+     char           __p;                 \
+     unsigned long  __n = (n);           \
+     __n ^= (__n >> 16);                 \
+-    asm ("xorb   %h1, %b1\n"            \
+-         "setpo  %0\n"                  \
+-         : "=qm" (__p), "=q" (__n)      \
++    asm ("xorb   %h1, %b1\n\t"          \
++         "setpo  %0"                    \
++         : __GMP_qm (__p), __GMP_q (__n)\
+          : "1" (__n));                  \
+     (p) = __p;                          \
+   } while (0)

diff --git a/dev-libs/gmp/gmp-4.1.4.ebuild b/dev-libs/gmp/gmp-4.1.4.ebuild
index dcf53e93ee207c1ed4c70bebef73932a0a81cf57..2fbc0b37d5ee5dda366ed3507fac61065eaa87a1 100644 (file)
--- a/dev-libs/gmp/gmp-4.1.4.ebuild
+++ b/dev-libs/gmp/gmp-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4.ebuild,v 1.3 2004/11/07 09:47:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4.ebuild,v 1.4 2004/11/28 11:13:49 blubb Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -31,6 +31,8 @@ src_unpack () {
 #   to remove the use of the '.' form in ppc64 assembler
        use ppc64 && epatch ${FILESDIR}/ppc64-gmp-acinclude.patch
 
+#      fix problems for -O3 or higher; bug #66780
+       use amd64 && epatch ${FILESDIR}/amd64.patch
        autoreconf
 }