disapproval of revision 'b8e46b797b32111526a2116d020fdd9e1c079965'
authorKoen Kooi <koen@openembedded.org>
Thu, 8 May 2008 06:52:09 +0000 (06:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 8 May 2008 06:52:09 +0000 (06:52 +0000)
13 files changed:
packages/gmp/files/.mtn2git_empty [deleted file]
packages/gmp/files/amd64.patch [deleted file]
packages/gmp/files/sh4-asmfix.patch [deleted file]
packages/gmp/files/x86-fat.diff [deleted file]
packages/gmp/gmp-4.1.2/amd64.patch [new file with mode: 0644]
packages/gmp/gmp-4.1.4/amd64.patch [new file with mode: 0644]
packages/gmp/gmp-4.1.4/sh4-asmfix.patch [new file with mode: 0644]
packages/gmp/gmp-4.2.1/amd64.patch [new file with mode: 0644]
packages/gmp/gmp-4.2.1/sh4-asmfix.patch [new file with mode: 0644]
packages/gmp/gmp-4.2.1/x86-fat.diff [new file with mode: 0644]
packages/gmp/gmp-4.2.2/amd64.patch [new file with mode: 0644]
packages/gmp/gmp-4.2.2/sh4-asmfix.patch [new file with mode: 0644]
packages/gmp/gmp-4.2.2/x86-fat.diff [new file with mode: 0644]

diff --git a/packages/gmp/files/.mtn2git_empty b/packages/gmp/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/gmp/files/amd64.patch b/packages/gmp/files/amd64.patch
deleted file mode 100644 (file)
index bbede7f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gmp-4.1.2/longlong.h
-===================================================================
---- gmp-4.1.2.orig/longlong.h  2005-06-24 13:38:06.787570452 -0700
-+++ gmp-4.1.2/longlong.h       2005-06-24 13:38:31.539556496 -0700
-@@ -715,8 +715,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 --git a/packages/gmp/files/sh4-asmfix.patch b/packages/gmp/files/sh4-asmfix.patch
deleted file mode 100644 (file)
index 1a01f61..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:44:00     1.1
-+++ gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:18:57
-@@ -29,8 +29,8 @@
-       .text
-       .align 2
--      .global ___gmpn_add_n
--___gmpn_add_n:
-+      .global __gmpn_add_n
-+__gmpn_add_n:
-       mov     #0,r3           ! clear cy save reg
- Loop: mov.l   @r5+,r1
---- gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:44:04     1.1
-+++ gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:18:59
-@@ -29,8 +29,8 @@
-       .text
-       .align 2
--      .global ___gmpn_sub_n
--___gmpn_sub_n:
-+      .global __gmpn_sub_n
-+__gmpn_sub_n:
-       mov     #0,r3           ! clear cy save reg
- Loop: mov.l   @r5+,r1
diff --git a/packages/gmp/files/x86-fat.diff b/packages/gmp/files/x86-fat.diff
deleted file mode 100644 (file)
index 2a54622..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-See:
-
- http://gmplib.org/patches/x86-fat.diff
- http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html
- http://gmplib.org/#BUGREPORTS
-
-Removed the configure part of the patch since we patch configure.in. It was
-only needed for FAT binaries anyway and this is being included to fix
-linking errors.
-
-Index: mpn/generic/addsub_n.c
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -p -2 -r1.1 -r1.2
-*** mpn/generic/addsub_n.c     14 Mar 2006 15:57:54 -0000      1.1
---- mpn/generic/addsub_n.c     15 May 2006 22:38:42 -0000      1.2
-***************
-*** 1,5 ****
-  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
-  
-! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-  
-  This file is part of the GNU MP Library.
---- 1,5 ----
-  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
-  
-! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
-  
-  This file is part of the GNU MP Library.
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 59,63 ****
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 59,63 ----
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc
-         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 65,69 ****
-         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 65,69 ----
-         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 82,86 ****
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 82,86 ----
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_sub_nc
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 88,92 ****
-         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
-  #endif
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 88,92 ----
-         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
-  #endif
-! #if HAVE_NATIVE_mpn_add_nc
-         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 98,102 ****
-    else
-      {
-!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
-        Need temporary storage.  */
-        mp_limb_t tp[PART_SIZE];
---- 98,102 ----
-    else
-      {
-!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa)
-        Need temporary storage.  */
-        mp_limb_t tp[PART_SIZE];
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 106,110 ****
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 106,110 ----
-       {
-         this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc
-         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 112,116 ****
-         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 112,116 ----
-         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc
-         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
diff --git a/packages/gmp/gmp-4.1.2/amd64.patch b/packages/gmp/gmp-4.1.2/amd64.patch
new file mode 100644 (file)
index 0000000..bbede7f
--- /dev/null
@@ -0,0 +1,16 @@
+Index: gmp-4.1.2/longlong.h
+===================================================================
+--- gmp-4.1.2.orig/longlong.h  2005-06-24 13:38:06.787570452 -0700
++++ gmp-4.1.2/longlong.h       2005-06-24 13:38:31.539556496 -0700
+@@ -715,8 +715,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 --git a/packages/gmp/gmp-4.1.4/amd64.patch b/packages/gmp/gmp-4.1.4/amd64.patch
new file mode 100644 (file)
index 0000000..67be9dd
--- /dev/null
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig  2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h       2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+    count is only an int. */
+ #define count_trailing_zeros(count, x)                                        \
+   do {                                                                        \
++    UDItype __cbtmp;                                                  \
+     ASSERT ((x) != 0);                                                        \
+-    __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x)));     \
++    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));    \
++    (count) = __cbtmp;                                                        \
+   } while (0)
+ #endif /* x86_64 */
diff --git a/packages/gmp/gmp-4.1.4/sh4-asmfix.patch b/packages/gmp/gmp-4.1.4/sh4-asmfix.patch
new file mode 100644 (file)
index 0000000..1a01f61
--- /dev/null
@@ -0,0 +1,26 @@
+--- gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:44:00     1.1
++++ gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:18:57
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_add_n
+-___gmpn_add_n:
++      .global __gmpn_add_n
++__gmpn_add_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
+--- gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:44:04     1.1
++++ gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:18:59
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_sub_n
+-___gmpn_sub_n:
++      .global __gmpn_sub_n
++__gmpn_sub_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
diff --git a/packages/gmp/gmp-4.2.1/amd64.patch b/packages/gmp/gmp-4.2.1/amd64.patch
new file mode 100644 (file)
index 0000000..67be9dd
--- /dev/null
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig  2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h       2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+    count is only an int. */
+ #define count_trailing_zeros(count, x)                                        \
+   do {                                                                        \
++    UDItype __cbtmp;                                                  \
+     ASSERT ((x) != 0);                                                        \
+-    __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x)));     \
++    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));    \
++    (count) = __cbtmp;                                                        \
+   } while (0)
+ #endif /* x86_64 */
diff --git a/packages/gmp/gmp-4.2.1/sh4-asmfix.patch b/packages/gmp/gmp-4.2.1/sh4-asmfix.patch
new file mode 100644 (file)
index 0000000..1a01f61
--- /dev/null
@@ -0,0 +1,26 @@
+--- gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:44:00     1.1
++++ gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:18:57
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_add_n
+-___gmpn_add_n:
++      .global __gmpn_add_n
++__gmpn_add_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
+--- gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:44:04     1.1
++++ gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:18:59
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_sub_n
+-___gmpn_sub_n:
++      .global __gmpn_sub_n
++__gmpn_sub_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
diff --git a/packages/gmp/gmp-4.2.1/x86-fat.diff b/packages/gmp/gmp-4.2.1/x86-fat.diff
new file mode 100644 (file)
index 0000000..2a54622
--- /dev/null
@@ -0,0 +1,122 @@
+See:
+
+ http://gmplib.org/patches/x86-fat.diff
+ http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html
+ http://gmplib.org/#BUGREPORTS
+
+Removed the configure part of the patch since we patch configure.in. It was
+only needed for FAT binaries anyway and this is being included to fix
+linking errors.
+
+Index: mpn/generic/addsub_n.c
+===================================================================
+RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -p -2 -r1.1 -r1.2
+*** mpn/generic/addsub_n.c     14 Mar 2006 15:57:54 -0000      1.1
+--- mpn/generic/addsub_n.c     15 May 2006 22:38:42 -0000      1.2
+***************
+*** 1,5 ****
+  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+  
+! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+  
+  This file is part of the GNU MP Library.
+--- 1,5 ----
+  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+  
+! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
+  
+  This file is part of the GNU MP Library.
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 59,63 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 59,63 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 65,69 ****
+         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 65,69 ----
+         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 82,86 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 82,86 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 88,92 ****
+         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+  #endif
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 88,92 ----
+         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+  #endif
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 98,102 ****
+    else
+      {
+!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
+        Need temporary storage.  */
+        mp_limb_t tp[PART_SIZE];
+--- 98,102 ----
+    else
+      {
+!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa)
+        Need temporary storage.  */
+        mp_limb_t tp[PART_SIZE];
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 106,110 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 106,110 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 112,116 ****
+         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 112,116 ----
+         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
diff --git a/packages/gmp/gmp-4.2.2/amd64.patch b/packages/gmp/gmp-4.2.2/amd64.patch
new file mode 100644 (file)
index 0000000..67be9dd
--- /dev/null
@@ -0,0 +1,14 @@
+--- gmp-4.1.4/longlong.h.orig  2004-04-22 00:34:28.000000000 +0200
++++ gmp-4.1.4/longlong.h       2005-07-18 01:13:06.000000000 +0200
+@@ -738,8 +738,10 @@
+    count is only an int. */
+ #define count_trailing_zeros(count, x)                                        \
+   do {                                                                        \
++    UDItype __cbtmp;                                                  \
+     ASSERT ((x) != 0);                                                        \
+-    __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x)));     \
++    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));    \
++    (count) = __cbtmp;                                                        \
+   } while (0)
+ #endif /* x86_64 */
diff --git a/packages/gmp/gmp-4.2.2/sh4-asmfix.patch b/packages/gmp/gmp-4.2.2/sh4-asmfix.patch
new file mode 100644 (file)
index 0000000..1a01f61
--- /dev/null
@@ -0,0 +1,26 @@
+--- gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:44:00     1.1
++++ gmp-4.1.4/mpn/sh/add_n.s   2005/11/17 08:18:57
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_add_n
+-___gmpn_add_n:
++      .global __gmpn_add_n
++__gmpn_add_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
+--- gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:44:04     1.1
++++ gmp-4.1.4/mpn/sh/sub_n.s   2005/11/17 08:18:59
+@@ -29,8 +29,8 @@
+       .text
+       .align 2
+-      .global ___gmpn_sub_n
+-___gmpn_sub_n:
++      .global __gmpn_sub_n
++__gmpn_sub_n:
+       mov     #0,r3           ! clear cy save reg
+ Loop: mov.l   @r5+,r1
diff --git a/packages/gmp/gmp-4.2.2/x86-fat.diff b/packages/gmp/gmp-4.2.2/x86-fat.diff
new file mode 100644 (file)
index 0000000..2a54622
--- /dev/null
@@ -0,0 +1,122 @@
+See:
+
+ http://gmplib.org/patches/x86-fat.diff
+ http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html
+ http://gmplib.org/#BUGREPORTS
+
+Removed the configure part of the patch since we patch configure.in. It was
+only needed for FAT binaries anyway and this is being included to fix
+linking errors.
+
+Index: mpn/generic/addsub_n.c
+===================================================================
+RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -p -2 -r1.1 -r1.2
+*** mpn/generic/addsub_n.c     14 Mar 2006 15:57:54 -0000      1.1
+--- mpn/generic/addsub_n.c     15 May 2006 22:38:42 -0000      1.2
+***************
+*** 1,5 ****
+  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+  
+! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+  
+  This file is part of the GNU MP Library.
+--- 1,5 ----
+  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
+  
+! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
+  
+  This file is part of the GNU MP Library.
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 59,63 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 59,63 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 65,69 ****
+         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 65,69 ----
+         acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 82,86 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 82,86 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 88,92 ****
+         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+  #endif
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 88,92 ----
+         scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
+  #endif
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 98,102 ****
+    else
+      {
+!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
+        Need temporary storage.  */
+        mp_limb_t tp[PART_SIZE];
+--- 98,102 ----
+    else
+      {
+!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa)
+        Need temporary storage.  */
+        mp_limb_t tp[PART_SIZE];
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 106,110 ****
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
+         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+  #else
+--- 106,110 ----
+       {
+         this_n = MIN (n - off, PART_SIZE);
+! #if HAVE_NATIVE_mpn_add_nc
+         acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
+  #else
+*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
+*** 112,116 ****
+         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else
+--- 112,116 ----
+         acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
+  #endif
+! #if HAVE_NATIVE_mpn_sub_nc
+         scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
+  #else