From 7bbabeae8f65800ca7c86aebffab5ad77c30eb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Wed, 21 Oct 2015 14:52:24 +0200
Subject: [PATCH] Disable reportedly broken assembly of Sparc(64)

fixes #292
---
 ChangeLog                 |  3 ++-
 include/polarssl/bn_mul.h | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 928012f84..71fdd7b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ Bugfix
      begin properly ignored. Found by mancha and Kasom Koht-arsa, #308
    * Fix build error with configurations where ECDHE-PSK is the only key
      exchange. Found and fix provided by Chris Hammond. #270
-
+   * Fix failures in MPI on Sparc(64) due to use of bad assembly code.
+     Found by Kurt Danielson. #292
 
 = mbed TLS 1.3.14 released 2015-10-06
 
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index b2eb1e8c7..55b94a74d 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -409,10 +409,11 @@
 #endif /* PPC32 */
 
 /*
- * The Sparc64 assembly is reported to be broken.
+ * The Sparc(64) assembly is reported to be broken.
  * Disable it for now, until we're able to fix it.
  */
-#if 0 && defined(__sparc__) && defined(__sparc64__)
+#if 0 && defined(__sparc__)
+#if defined(__sparc64__)
 
 #define MULADDC_INIT                                    \
     asm(                                                \
@@ -443,9 +444,8 @@
         : "g1", "o0", "o1", "o2", "o3", "o4",   \
           "o5"                                  \
         );
-#endif /* SPARCv9 */
 
-#if defined(__sparc__) && !defined(__sparc64__)
+#else /* __sparc64__ */
 
 #define MULADDC_INIT                                    \
     asm(                                                \
@@ -477,7 +477,8 @@
           "o5"                                  \
         );
 
-#endif /* SPARCv8 */
+#endif /* __sparc64__ */
+#endif /* __sparc__ */
 
 #if defined(__microblaze__) || defined(microblaze)