Page MenuHome GnuPG
Files F34183547

D132.diff
No OneTemporary
Actions

D132.diff
View Options

Index: gnupg-1.4.10/mpi/longlong.h
===================================================================
--- gnupg-1.4.10/mpi/longlong.h
+++ gnupg-1.4.10/mpi/longlong.h
@@ -706,18 +706,35 @@
#endif /* __m88110__ */
#endif /* __m88000__ */
+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
+#define __GNUC_PREREQ(maj, min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+#define __GNUC_PREREQ(maj, min) 0
+#endif
+
/***************************************
************** MIPS *****************
***************************************/
#if defined (__mips__) && W_TYPE_SIZE == 32
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+#if __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) && __GNUC_PREREQ (2,7)
#define umul_ppmm(w1, w0, u, v) \
__asm__ ("multu %2,%3" \
: "=l" ((USItype)(w0)), \
"=h" ((USItype)(w1)) \
: "d" ((USItype)(u)), \
"d" ((USItype)(v)))
-#else
+#endif
+#if !defined (umul_ppmm)
#define umul_ppmm(w1, w0, u, v) \
__asm__ ("multu %2,%3 \n" \
"mflo %0 \n" \

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 9:48 AM (12 h, 30 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
ae/38/ad53e2b12999181e22dc764f1503

Event Timeline