[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  cc2cb7bf63c62aaebd387f546a2fd673f367d9a8 (commit)
      from  758baa3dc250f12b92b1bebe86ad114f25763c04 (commit)


- Log -----------------------------------------------------------------
commit cc2cb7bf63c62aaebd387f546a2fd673f367d9a8
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 10 18:57:14 2016 +0200

    bn/bn_lcl.h: improve interoperability with clang and Android NDK.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_lcl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 157dadc..a3911b1 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -428,8 +428,8 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
 #   endif
 #  elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
 #   if defined(__GNUC__) && __GNUC__>=2
-#    if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
-                                     /* "h" constraint is no more since 4.4 */
+#    if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
+      /* "h" constraint is not an option on R6 and was removed in 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);   \