diff options
Diffstat (limited to 'package/mpfr')
| -rw-r--r-- | package/mpfr/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/mpfr/patches/patch-mpfr-longlong_h | 48 | ||||
| -rw-r--r-- | package/mpfr/patches/patch-src_mpfr-longlong_h | 11 |
3 files changed, 11 insertions, 59 deletions
diff --git a/package/mpfr/patches/patch-ltmain_sh b/package/mpfr/patches/patch-ltmain_sh deleted file mode 100644 index 117f89c34..000000000 --- a/package/mpfr/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- mpfr-2.4.2.orig/ltmain.sh 2009-11-30 03:43:54.000000000 +0100 -+++ mpfr-2.4.2/ltmain.sh 2011-01-15 14:26:14.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/mpfr/patches/patch-mpfr-longlong_h b/package/mpfr/patches/patch-mpfr-longlong_h deleted file mode 100644 index 7bf1567ee..000000000 --- a/package/mpfr/patches/patch-mpfr-longlong_h +++ /dev/null @@ -1,48 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mpfr-2.4.1.orig/mpfr-longlong.h 2009-02-20 10:43:17.000000000 +0100 -+++ mpfr-2.4.1/mpfr-longlong.h 2009-05-29 15:11:21.000000000 +0200 -@@ -1011,10 +1011,19 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( - #endif /* __m88000__ */ - - #if defined (__mips) && W_TYPE_SIZE == 32 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if __GMP_GNUC_PREREQ (4,4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ UDItype __ll = (UDItype)(u) * (v); \ -+ w1 = __ll >> 32; \ -+ w0 = __ll; \ -+ } while (0) -+#endif -+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else -+#endif -+#if !defined (umul_ppmm) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) -@@ -1024,10 +1033,20 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( - #endif /* __mips */ - - #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 --#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -+#if __GMP_GNUC_PREREQ (4,4) -+#define umul_ppmm(w1, w0, u, v) \ -+ do { \ -+ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ -+ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ -+ w1 = __ll >> 64; \ -+ w0 = __ll; \ -+ } while (0) -+#endif -+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) --#else -+#endif -+#if !defined (umul_ppmm) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ - : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) diff --git a/package/mpfr/patches/patch-src_mpfr-longlong_h b/package/mpfr/patches/patch-src_mpfr-longlong_h new file mode 100644 index 000000000..e68cfa752 --- /dev/null +++ b/package/mpfr/patches/patch-src_mpfr-longlong_h @@ -0,0 +1,11 @@ +--- mpfr-3.1.2.orig/src/mpfr-longlong.h 2013-03-13 16:37:32.000000000 +0100 ++++ mpfr-3.1.2/src/mpfr-longlong.h 2014-01-06 16:29:39.854354889 +0100 +@@ -1043,7 +1043,7 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( + #define UDIV_TIME 100 + #endif /* __mips */ + +-#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 ++#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 && defined (_LP64) + #if __GMP_GNUC_PREREQ (4,4) + #define umul_ppmm(w1, w0, u, v) \ + do { \ |