[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  60c268b21ac81cc6b1af5c5470282a613b96f6fd (commit)
      from  cf89a80e25b79ae0e6004e4a2509bf656fb59168 (commit)


- Log -----------------------------------------------------------------
commit 60c268b21ac81cc6b1af5c5470282a613b96f6fd
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 25 10:17:14 2015 +0200

    bn/bn_lcl.h: fix MIPS-specific gcc version check.
    
    RT#3859
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 196df7e..b9d124a 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -443,7 +443,7 @@ 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_MINOR__>=4
+#    if __GNUC__>4 || (__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) ({     \