diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-09-01 13:23:05 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-09-01 13:23:05 +0000 |
| commit | 554cf97f038f8dcc25c781fea8e9053459593abc (patch) | |
| tree | a9920542e9982ed06a2e451a595ed5c1ee687632 | |
| parent | 48ccbeefda5906388f8c739ebe2996f1f3bd7593 (diff) | |
bn_lcl.h: gcc removed support for "h" constraint, which broke inline
assembler [from HEAD].
| -rw-r--r-- | crypto/bn/bn_lcl.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index eecfd8cc99..817c773b65 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -282,16 +282,23 @@ extern "C" { # endif # elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)) # if defined(__GNUC__) && __GNUC__>=2 -# define BN_UMULT_HIGH(a,b) ({ \ +# if __GNUC__>=4 && __GNUC_MINOR__>=4 /* "h" constraint is no more since 4.4 */ +# define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64) +# define BN_UMULT_LOHI(low,high,a,b) ({ \ + __uint128_t ret=(__uint128_t)(a)*(b); \ + (high)=ret>>64; (low)=ret; }) +# else +# define BN_UMULT_HIGH(a,b) ({ \ register BN_ULONG ret; \ asm ("dmultu %1,%2" \ : "=h"(ret) \ : "r"(a), "r"(b) : "l"); \ ret; }) -# define BN_UMULT_LOHI(low,high,a,b) \ +# define BN_UMULT_LOHI(low,high,a,b)\ asm ("dmultu %2,%3" \ : "=l"(low),"=h"(high) \ : "r"(a), "r"(b)); +# endif # endif # endif /* cpu */ #endif /* OPENSSL_NO_ASM */ |