1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/mpfr/2.4.2/110-longlong.h.patch	Thu Jan 07 18:31:13 2010 +0100
     1.3 @@ -0,0 +1,71 @@
     1.4 +diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
     1.5 +--- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
     1.6 ++++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
     1.7 +@@ -0,0 +1 @@
     1.8 ++longlong.h
     1.9 +diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
    1.10 +--- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
    1.11 ++++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
    1.12 +@@ -1 +1 @@
    1.13 +-2.4.2-p1
    1.14 ++2.4.2-p2
    1.15 +diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
    1.16 +--- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
    1.17 ++++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
    1.18 +@@ -1011,7 +1011,15 @@
    1.19 + #endif /* __m88000__ */
    1.20 + 
    1.21 + #if defined (__mips) && W_TYPE_SIZE == 32
    1.22 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
    1.23 ++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
    1.24 ++#define umul_ppmm(w1, w0, u, v) \
    1.25 ++  do {									\
    1.26 ++    UDItype _r;							\
    1.27 ++    _r = (UDItype) u * v;						\
    1.28 ++    (w1) = _r >> 32;							\
    1.29 ++    (w0) = (USItype) _r;						\
    1.30 ++  } while (0)
    1.31 ++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
    1.32 + #define umul_ppmm(w1, w0, u, v) \
    1.33 +   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
    1.34 + #else
    1.35 +@@ -1024,7 +1032,16 @@
    1.36 + #endif /* __mips */
    1.37 + 
    1.38 + #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
    1.39 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
    1.40 ++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
    1.41 ++typedef unsigned int UTItype __attribute__ ((mode (TI)));
    1.42 ++#define umul_ppmm(w1, w0, u, v) \
    1.43 ++  do {									\
    1.44 ++    UTItype _r;							\
    1.45 ++    _r = (UTItype) u * v;						\
    1.46 ++    (w1) = _r >> 64;							\
    1.47 ++    (w0) = (UDItype) _r;						\
    1.48 ++  } while (0)
    1.49 ++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
    1.50 + #define umul_ppmm(w1, w0, u, v) \
    1.51 +   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
    1.52 + #else
    1.53 +diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
    1.54 +--- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
    1.55 ++++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
    1.56 +@@ -27,7 +27,7 @@
    1.57 + #define MPFR_VERSION_MAJOR 2
    1.58 + #define MPFR_VERSION_MINOR 4
    1.59 + #define MPFR_VERSION_PATCHLEVEL 2
    1.60 +-#define MPFR_VERSION_STRING "2.4.2-p1"
    1.61 ++#define MPFR_VERSION_STRING "2.4.2-p2"
    1.62 + 
    1.63 + /* Macros dealing with MPFR VERSION */
    1.64 + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
    1.65 +diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
    1.66 +--- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
    1.67 ++++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
    1.68 +@@ -25,5 +25,5 @@
    1.69 + const char *
    1.70 + mpfr_get_version (void)
    1.71 + {
    1.72 +-  return "2.4.2-p1";
    1.73 ++  return "2.4.2-p2";
    1.74 + }