Pass -Werror in the !BN_LLONG !BN_UMULT_LOHI !BN_UMULT_HIGH case.

diff --git a/lib/libcrypto/bn/bn_asm.c b/lib/libcrypto/bn/bn_asm.c
index c43c91c..f1a0944 100644 (file)
--- a/lib/libcrypto/bn/bn_asm.c
+++ b/lib/libcrypto/bn/bn_asm.c
@@ -558,7 +558,7 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
        {
 #ifdef BN_LLONG
        BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -667,7 +667,7 @@ void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
        {
 #ifdef BN_LLONG
        BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -712,7 +712,7 @@ void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a)
        {
 #ifdef BN_LLONG
        BN_ULLONG t,tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -793,7 +793,7 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
        {
 #ifdef BN_LLONG
        BN_ULLONG t,tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;

diff --git a/lib/libssl/src/crypto/bn/bn_asm.c b/lib/libssl/src/crypto/bn/bn_asm.c
index c43c91c..f1a0944 100644 (file)
--- a/lib/libssl/src/crypto/bn/bn_asm.c
+++ b/lib/libssl/src/crypto/bn/bn_asm.c
@@ -558,7 +558,7 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
        {
 #ifdef BN_LLONG
        BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -667,7 +667,7 @@ void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
        {
 #ifdef BN_LLONG
        BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -712,7 +712,7 @@ void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a)
        {
 #ifdef BN_LLONG
        BN_ULLONG t,tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;
@@ -793,7 +793,7 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
        {
 #ifdef BN_LLONG
        BN_ULLONG t,tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
        BN_ULONG bl,bh;
 #endif
        BN_ULONG t1,t2;