From: Andy Polyakov <appro@openssl.org>
Date: Mon, 25 May 2015 08:17:14 +0000 (+0200)
Subject: bn/bn_lcl.h: fix MIPS-specific gcc version check.
X-Git-Tag: OpenSSL_1_0_1n~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8af13192708a8560916d10dcb0475273c4597172;p=openssl

bn/bn_lcl.h: fix MIPS-specific gcc version check.

RT#3859

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 60c268b21ac81cc6b1af5c5470282a613b96f6fd)
---

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 1059d1d4b5..904a723497 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -276,7 +276,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) ({     \