diff options
| author | Werner Koch <[email protected]> | 2010-06-01 12:42:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-06-01 12:42:39 +0000 |
| commit | c253383ab1fd30b226605fda2b254265646e74a4 (patch) | |
| tree | f12b1e87a1f8b6d35565ab9eb92c4317a01b373a | |
| parent | Ignore some GnuPG-2 only options. (diff) | |
| download | gnupg-c253383ab1fd30b226605fda2b254265646e74a4.tar.gz gnupg-c253383ab1fd30b226605fda2b254265646e74a4.zip | |
Fix bug 1231.
Minor doc improvement.
| -rw-r--r-- | doc/gpg.texi | 3 | ||||
| -rw-r--r-- | mpi/ChangeLog | 5 | ||||
| -rw-r--r-- | mpi/longlong.h | 11 |
3 files changed, 16 insertions, 3 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 212ab95bc..7e45dfbbb 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -845,7 +845,8 @@ key rings. @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: diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 6209b1ecc..509f2f424 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2010-06-01 Werner Koch <[email protected]> + + * longlong.h (umul_ppmm) <__mips__>: Add code for gcc 4.4. This + fixes bug#1231. + 2009-12-09 Werner Koch <[email protected]> * config.links: Remove asm modules for all sparc64. This is diff --git a/mpi/longlong.h b/mpi/longlong.h index ba437f217..aeecf1e68 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -710,8 +710,15 @@ extern USItype __udiv_qrnnd (); ************** 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)) \ |