|
yann@1699
|
1 |
diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
|
|
yann@1699
|
2 |
--- mpfr-2.4.2-a/PATCHES 2009-12-18 12:03:30.000000000 +0000
|
|
yann@1699
|
3 |
+++ mpfr-2.4.2-b/PATCHES 2009-12-18 12:05:19.000000000 +0000
|
|
yann@1699
|
4 |
@@ -0,0 +1 @@
|
|
yann@1699
|
5 |
+longlong.h
|
|
yann@1699
|
6 |
diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
|
|
yann@1699
|
7 |
--- mpfr-2.4.2-a/VERSION 2009-12-07 13:37:12.000000000 +0000
|
|
yann@1699
|
8 |
+++ mpfr-2.4.2-b/VERSION 2009-12-18 12:05:09.000000000 +0000
|
|
yann@1699
|
9 |
@@ -1 +1 @@
|
|
yann@1699
|
10 |
-2.4.2-p1
|
|
yann@1699
|
11 |
+2.4.2-p2
|
|
yann@1699
|
12 |
diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
|
|
yann@1699
|
13 |
--- mpfr-2.4.2-a/mpfr-longlong.h 2009-11-30 02:43:08.000000000 +0000
|
|
yann@1699
|
14 |
+++ mpfr-2.4.2-b/mpfr-longlong.h 2009-12-18 12:04:29.000000000 +0000
|
|
yann@1699
|
15 |
@@ -1011,7 +1011,15 @@
|
|
yann@1699
|
16 |
#endif /* __m88000__ */
|
|
yann@1699
|
17 |
|
|
yann@1699
|
18 |
#if defined (__mips) && W_TYPE_SIZE == 32
|
|
yann@1699
|
19 |
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
|
yann@1699
|
20 |
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
|
|
yann@1699
|
21 |
+#define umul_ppmm(w1, w0, u, v) \
|
|
yann@1699
|
22 |
+ do { \
|
|
yann@1699
|
23 |
+ UDItype _r; \
|
|
yann@1699
|
24 |
+ _r = (UDItype) u * v; \
|
|
yann@1699
|
25 |
+ (w1) = _r >> 32; \
|
|
yann@1699
|
26 |
+ (w0) = (USItype) _r; \
|
|
yann@1699
|
27 |
+ } while (0)
|
|
yann@1699
|
28 |
+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
|
yann@1699
|
29 |
#define umul_ppmm(w1, w0, u, v) \
|
|
yann@1699
|
30 |
__asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
|
|
yann@1699
|
31 |
#else
|
|
yann@1699
|
32 |
@@ -1024,7 +1032,16 @@
|
|
yann@1699
|
33 |
#endif /* __mips */
|
|
yann@1699
|
34 |
|
|
yann@1699
|
35 |
#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
|
|
yann@1699
|
36 |
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
|
yann@1699
|
37 |
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
|
|
yann@1699
|
38 |
+typedef unsigned int UTItype __attribute__ ((mode (TI)));
|
|
yann@1699
|
39 |
+#define umul_ppmm(w1, w0, u, v) \
|
|
yann@1699
|
40 |
+ do { \
|
|
yann@1699
|
41 |
+ UTItype _r; \
|
|
yann@1699
|
42 |
+ _r = (UTItype) u * v; \
|
|
yann@1699
|
43 |
+ (w1) = _r >> 64; \
|
|
yann@1699
|
44 |
+ (w0) = (UDItype) _r; \
|
|
yann@1699
|
45 |
+ } while (0)
|
|
yann@1699
|
46 |
+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
|
yann@1699
|
47 |
#define umul_ppmm(w1, w0, u, v) \
|
|
yann@1699
|
48 |
__asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
|
|
yann@1699
|
49 |
#else
|
|
yann@1699
|
50 |
diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
|
|
yann@1699
|
51 |
--- mpfr-2.4.2-a/mpfr.h 2009-12-07 13:37:12.000000000 +0000
|
|
yann@1699
|
52 |
+++ mpfr-2.4.2-b/mpfr.h 2009-12-18 12:05:09.000000000 +0000
|
|
yann@1699
|
53 |
@@ -27,7 +27,7 @@
|
|
yann@1699
|
54 |
#define MPFR_VERSION_MAJOR 2
|
|
yann@1699
|
55 |
#define MPFR_VERSION_MINOR 4
|
|
yann@1699
|
56 |
#define MPFR_VERSION_PATCHLEVEL 2
|
|
yann@1699
|
57 |
-#define MPFR_VERSION_STRING "2.4.2-p1"
|
|
yann@1699
|
58 |
+#define MPFR_VERSION_STRING "2.4.2-p2"
|
|
yann@1699
|
59 |
|
|
yann@1699
|
60 |
/* Macros dealing with MPFR VERSION */
|
|
yann@1699
|
61 |
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
|
yann@1699
|
62 |
diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
|
|
yann@1699
|
63 |
--- mpfr-2.4.2-a/version.c 2009-12-07 13:37:12.000000000 +0000
|
|
yann@1699
|
64 |
+++ mpfr-2.4.2-b/version.c 2009-12-18 12:05:09.000000000 +0000
|
|
yann@1699
|
65 |
@@ -25,5 +25,5 @@
|
|
yann@1699
|
66 |
const char *
|
|
yann@1699
|
67 |
mpfr_get_version (void)
|
|
yann@1699
|
68 |
{
|
|
yann@1699
|
69 |
- return "2.4.2-p1";
|
|
yann@1699
|
70 |
+ return "2.4.2-p2";
|
|
yann@1699
|
71 |
}
|