- updated for gmp-4.1.3

Changed files:
    gmp-amd64.patch -> 1.3
    gmp-asmcpu.patch -> 1.6

diff --git a/gmp-amd64.patch b/gmp-amd64.patch
index 9b449d7020211a5b27107d96557881675ec0ab55..70a34a9a28d61cc37096d05f5ba795366a1370e0 100644 (file)
--- a/gmp-amd64.patch
+++ b/gmp-amd64.patch
@@ -50,18 +50,6 @@ diff -urN gmp-4.1.2.org/longlong.h gmp-4.1.2/longlong.h
  #define count_leading_zeros(count, x)                                 \
    do {                                                                        \
      UDItype __cbtmp;                                                  \
-@@ -715,8 +717,10 @@
-   } while (0)
- #define count_trailing_zeros(count, x)                                        \
-   do {                                                                        \
-+    UDItype __cbtmp;                                                    \
-     ASSERT ((x) != 0);                                                        \
--    __asm__ ("bsfq %1,%0" : "=r" (count) : "rm" ((UDItype)(x)));      \
-+    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));    \
-+    (count) = __cbtmp;                                                  \
-   } while (0)
- #endif /* x86_64 */
- 
 diff -urN gmp-4.1.2.org/mpn/x86_64/gmp-mparam.h gmp-4.1.2/mpn/x86_64/gmp-mparam.h
 --- gmp-4.1.2.org/mpn/x86_64/gmp-mparam.h      1970-01-01 01:00:00.000000000 +0100
 +++ gmp-4.1.2/mpn/x86_64/gmp-mparam.h  2003-11-18 18:52:08.000000000 +0100

diff --git a/gmp-asmcpu.patch b/gmp-asmcpu.patch
index 9c16c48a3a055043bf3758e4863768caac563342..a0282a7dcdf8a089f077f468a5a72f0cd3540979 100644 (file)
--- a/gmp-asmcpu.patch
+++ b/gmp-asmcpu.patch
@@ -27,7 +27,7 @@
 -      [k6[23]*-*-*])  path="x86/k6/k62mmx x86/k6/mmx x86/k6 x86" ;;
 -      k6*-*-*)        path="x86/k6/mmx x86/k6 x86" ;;
 -      athlon-*-*)     path="x86/k7/mmx x86/k7 x86" ;;
--      pentium4-*-*)   path="x86/pentium4/sse2 x86/pentium4/mmx x86/pentium4 x86" ;;
+-      pentium4-*-* | i786-*-*)    path="x86/pentium4/sse2 x86/pentium4/mmx x86/pentium4 x86" ;;
 +    case $with_cpu in
 +      i486*)                  path="x86/i486 x86" ;;
 +      pentiummmx*)             path="x86/pentium/mmx x86/pentium x86" ;;
@@ -37,7 +37,7 @@
 +      [k6[23]*])  path="x86/k6/k62mmx x86/k6/mmx x86/k6 x86" ;;
 +      k6*)        path="x86/k6/mmx x86/k6 x86" ;;
 +      athlon*)     path="x86/k7/mmx x86/k7 x86" ;;
-+      pentium4*)   path="x86/pentium4/sse2 x86/pentium4/mmx x86/pentium4 x86" ;;
++      pentium4* | i786*)    path="x86/pentium4/sse2 x86/pentium4/mmx x86/pentium4 x86" ;;
 +      i586* | pentium*)    path="x86/pentium x86" ;;
      esac
      ;;