summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-05-05 20:49:08 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-05-05 20:49:08 (GMT)
commit809963a064bfad0100552bb97cb35177dfa74165 (patch)
tree96a97e730b59435c64ba875fb5bb90b4c82ac7d8
parentf31a1dc03558ee8b0a7b9af33debf4d0b256d3ee (diff)
Update the patchset for MPFR 2.4.1 from upstream.
-------- diffstat follows -------- /trunk/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch | 25 25 0 0 ++++++++++++ /trunk/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch | 45 45 0 0 ++++++++++++++++++++++ /trunk/patches/mpfr/2.4.1/140-zeta_ui-shift.patch | 47 47 0 0 +++++++++++++++++++++++ 3 files changed, 117 insertions(+)
-rw-r--r--patches/mpfr/2.4.1/120-cast-to-void-ptr.patch25
-rw-r--r--patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch45
-rw-r--r--patches/mpfr/2.4.1/140-zeta_ui-shift.patch47
3 files changed, 117 insertions, 0 deletions
diff --git a/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch b/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch
new file mode 100644
index 0000000..e85136a
--- /dev/null
+++ b/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch
@@ -0,0 +1,25 @@
+diff -Naurd mpfr-2.4.1-a/tests/tfprintf.c mpfr-2.4.1-b/tests/tfprintf.c
+--- mpfr-2.4.1-a/tests/tfprintf.c 2009-02-20 09:43:15.000000000 +0000
++++ mpfr-2.4.1-b/tests/tfprintf.c 2009-03-10 01:12:45.000000000 +0000
+@@ -195,7 +195,7 @@
+ check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz);
+ check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi);
+ check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr,
+- &i);
++ (void *) &i);
+ check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
+
+ #ifndef NPRINTF_T
+diff -Naurd mpfr-2.4.1-a/tests/tprintf.c mpfr-2.4.1-b/tests/tprintf.c
+--- mpfr-2.4.1-a/tests/tprintf.c 2009-02-20 09:43:15.000000000 +0000
++++ mpfr-2.4.1-b/tests/tprintf.c 2009-03-10 01:12:45.000000000 +0000
+@@ -191,7 +191,8 @@
+ check_length (5, sz, 34, zu);
+ check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz);
+ check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi);
+- check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", mpfr, mpq, &mpfr, &i);
++ check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p",
++ mpfr, mpq, &mpfr, (void *) &i);
+ check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
+
+ #ifndef NPRINTF_T
diff --git a/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch b/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
new file mode 100644
index 0000000..08e21f2
--- /dev/null
+++ b/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
@@ -0,0 +1,45 @@
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES 2009-03-10 01:44:39.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES 2009-03-10 01:44:40.000000000 +0000
+@@ -0,0 +1 @@
++vasprintf-mp_limb_t
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/VERSION 2009-03-10 01:44:40.000000000 +0000
+@@ -1 +1 @@
+-2.4.1-p2
++2.4.1-p4
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h 2009-03-10 01:44:40.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1-p2"
++#define MPFR_VERSION_STRING "2.4.1-p4"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/vasprintf.c mpfr-2.4.1-b/vasprintf.c
+--- mpfr-2.4.1-a/vasprintf.c 2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/vasprintf.c 2009-03-10 01:44:40.000000000 +0000
+@@ -398,7 +398,7 @@
+ (void) va_arg ((ap), mpq_srcptr); \
+ break; \
+ case MP_LIMB_ARG: \
+- (void) va_arg ((ap), mp_ptr); \
++ (void) va_arg ((ap), mp_limb_t); \
+ break; \
+ case MP_LIMB_ARRAY_ARG: \
+ (void) va_arg ((ap), mp_ptr); \
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/version.c 2009-03-10 01:44:40.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "2.4.1-p2";
++ return "2.4.1-p4";
+ }
diff --git a/patches/mpfr/2.4.1/140-zeta_ui-shift.patch b/patches/mpfr/2.4.1/140-zeta_ui-shift.patch
new file mode 100644
index 0000000..710c698
--- /dev/null
+++ b/patches/mpfr/2.4.1/140-zeta_ui-shift.patch
@@ -0,0 +1,47 @@
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES 2009-03-13 02:50:47.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES 2009-03-13 02:50:48.000000000 +0000
+@@ -0,0 +1 @@
++zeta_ui-shift
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/VERSION 2009-03-13 02:50:48.000000000 +0000
+@@ -1 +1 @@
+-2.4.1-p4
++2.4.1-p5
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h 2009-03-13 02:50:48.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1-p4"
++#define MPFR_VERSION_STRING "2.4.1-p5"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/version.c 2009-03-13 02:50:48.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "2.4.1-p4";
++ return "2.4.1-p5";
+ }
+diff -Naurd mpfr-2.4.1-a/zeta_ui.c mpfr-2.4.1-b/zeta_ui.c
+--- mpfr-2.4.1-a/zeta_ui.c 2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/zeta_ui.c 2009-03-13 02:50:48.000000000 +0000
+@@ -177,7 +177,9 @@
+ mpz_mul_ui (t, t, 2 * k - 1);
+ }
+ mpz_div_2exp (t, t, 1);
+- if (n < 1UL << (BITS_PER_MP_LIMB / 2))
++ /* Warning: the test below assumes that an unsigned long
++ has no padding bits. */
++ if (n < 1UL << ((sizeof(unsigned long) * CHAR_BIT) / 2))
+ /* (n - k + 1) * (n + k - 1) < n^2 */
+ mpz_divexact_ui (t, t, (n - k + 1) * (n + k - 1));
+ else