[svn] GnuPG - r5345 - in branches/STABLE-BRANCH-1-4: doc mpi

[svn author wk]

Author: wk
Date: 2010-06-01 14:42:39 +0200 (Tue, 01 Jun 2010)
New Revision: 5345

Modified:
   branches/STABLE-BRANCH-1-4/doc/gpg.texi
   branches/STABLE-BRANCH-1-4/mpi/ChangeLog
   branches/STABLE-BRANCH-1-4/mpi/longlong.h
Log:
Fix bug 1231.
Minor doc improvement.


Modified: branches/STABLE-BRANCH-1-4/mpi/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/mpi/ChangeLog	2010-06-01 12:13:31 UTC (rev 5344)
+++ branches/STABLE-BRANCH-1-4/mpi/ChangeLog	2010-06-01 12:42:39 UTC (rev 5345)
@@ -1,3 +1,8 @@
+2010-06-01  Werner Koch  <wk at g10code.com>
+
+	* longlong.h (umul_ppmm) <__mips__>: Add code for gcc 4.4.  This
+	fixes bug#1231.
+
 2009-12-09  Werner Koch  <wk at g10code.com>
 
 	* config.links: Remove asm modules for all sparc64.  This is

Modified: branches/STABLE-BRANCH-1-4/doc/gpg.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/gpg.texi	2010-06-01 12:13:31 UTC (rev 5344)
+++ branches/STABLE-BRANCH-1-4/doc/gpg.texi	2010-06-01 12:42:39 UTC (rev 5345)
@@ -845,7 +845,8 @@
 
 @c man:.RS
 The listing shows you the key with its secondary keys and all user
-ids. Selected keys or user ids are indicated by an asterisk. The trust
+ids.  The primary user id is indicated by a dot, and selected keys or
+user ids are indicated by an asterisk.  The trust
 value is displayed with the primary key: the first is the assigned owner
 trust and the second is the calculated trust value. Letters are used for
 the values:

Modified: branches/STABLE-BRANCH-1-4/mpi/longlong.h
===================================================================
--- branches/STABLE-BRANCH-1-4/mpi/longlong.h	2010-06-01 12:13:31 UTC (rev 5344)
+++ branches/STABLE-BRANCH-1-4/mpi/longlong.h	2010-06-01 12:42:39 UTC (rev 5345)
@@ -710,8 +710,15 @@
  **************  MIPS  *****************
  ***************************************/
 #if defined (__mips__) && W_TYPE_SIZE == 32
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-#define umul_ppmm(w1, w0, u, v) \
+#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
+#define umul_ppmm(w1, w0, u, v)                                         \
+  do {                                                                  \
+    UDItype __ll = (UDItype)(u) * (v);                                  \
+    w1 = __ll >> 32;                                                    \
+    w0 = __ll;                                                          \
+  } while (0)
+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+#define umul_ppmm(w1, w0, u, v)                                         \
   __asm__ ("multu %2,%3"                                                \
 	   : "=l" ((USItype)(w0)),                                      \
 	     "=h" ((USItype)(w1))                                       \