summaryrefslogtreecommitdiff
path: root/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch')
-rw-r--r--extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch b/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
deleted file mode 100644
index 5fcbdc628..000000000
--- a/extra/gnupg/gnupg_1.4.11_mips_gcc4.4.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-## mips_gcc4.4 by Werner Koch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build fails on mips(el) due to changes the removal
-## DP: of the 'h' constraint for MIPS in gcc-4.4.x versions.
-## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-devel/2010-October/025805.html>
-
-diff -Nur gnupg-1.4.11.orig/mpi/longlong.h gnupg-1.4.11/mpi/longlong.h
---- gnupg-1.4.11.orig/mpi/longlong.h 2010-06-01 13:01:46.000000000 +0200
-+++ gnupg-1.4.11/mpi/longlong.h 2010-10-28 22:01:19.000000000 +0200
-@@ -710,12 +710,13 @@
- ************** MIPS *****************
- ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
--#define umul_ppmm(w1, w0, u, v) \
-+#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
- do { \
-- UDItype __ll = (UDItype)(u) * (v); \
-- w1 = __ll >> 32; \
-- w0 = __ll; \
-+ UDItype _r; \
-+ _r = (UDItype) u * v; \
-+ (w1) = _r >> 32; \
-+ (w0) = (USItype) _r; \
- } while (0)
- #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-@@ -742,7 +743,16 @@
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+ typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+ # define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ UTItype _r; \
-+ _r = (UTItype) u * v; \
-+ (w1) = _r >> 64; \
-+ (w0) = (UDItype) _r; \
-+ } while (0)
-+# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("dmultu %2,%3" \
- : "=l" ((UDItype)(w0)), \