From 857087d4424128eb2fe843e25cb2d2244c10379b Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Thu, 1 May 2014 20:40:55 +0000
Subject: [PATCH] Pass -Werror in the !BN_LLONG !BN_UMULT_LOHI !BN_UMULT_HIGH
 case.

---
 lib/libcrypto/bn/bn_asm.c         | 8 ++++----
 lib/libssl/src/crypto/bn/bn_asm.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libcrypto/bn/bn_asm.c b/lib/libcrypto/bn/bn_asm.c
index c43c91cc09f..f1a09440893 100644
--- 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 c43c91cc09f..f1a09440893 100644
--- 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;
-- 
2.20.1