diff options
| author | Werner Koch <[email protected]> | 2010-12-23 19:05:31 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-12-23 19:05:31 +0000 |
| commit | 36366dab85522e8aee7d685b8cbf5223063794a5 (patch) | |
| tree | f493b3ab112abb9886ca798d7fb68a43b77bc1c7 | |
| parent | * gpg.c (main): Do not provide a default for (diff) | |
| download | gnupg-36366dab85522e8aee7d685b8cbf5223063794a5.tar.gz gnupg-36366dab85522e8aee7d685b8cbf5223063794a5.zip | |
Revert last two changes and replace by code from libgcrypt 1.4.6.
| -rw-r--r-- | mpi/ChangeLog | 5 | ||||
| -rw-r--r-- | mpi/longlong.h | 26 |
2 files changed, 19 insertions, 12 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog index a154d354a..a99acae80 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2010-10-28 Werner Koch <[email protected]> + + * longlong.h: Revert last two changes and replace by code from + libgcrypt 1.4.6. + 2010-10-22 Jason Woodward <[email protected]> (wk) * longlong.h (umul_ppmm) [mips32]: Fix typo. diff --git a/mpi/longlong.h b/mpi/longlong.h index 147986f3e..f17e84a88 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -710,12 +710,13 @@ extern USItype __udiv_qrnnd (); ************** 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,14 +743,15 @@ extern USItype __udiv_qrnnd (); ************** MIPS/64 ************** ***************************************/ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 -# if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) +# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) + typedef unsigned int UTItype __attribute__ ((mode (TI))); # 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) + 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" \ |