commit 39f5fcce93e7da3bf35a1d3c565418f837a2ff5d
author Simon Butcher <simon.butcher@arm.com> Sun Jun 17 18:00:59 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Sun Jun 17 18:00:59 2018 +0100
tree a9f1ef38b6864a30340ce0940bb6b02dea4d7d7a
parent 29298cbf8c30517d2813b88d9d5d09e998b48203
parent db3fe7cbe408f8c8d44776cb3d2db7b1f49cfa26

Merge remote-tracking branch 'public/pr/1733' into mbedtls-2.1

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 93d017c..e6dc781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
      calling mbedtls_x509_crt_parse_path().
    * Fix redundant declaration of mbedtls_ssl_list_ciphersuites. Raised by
      TrinityTonic. #1359.
+   * Fix an issue with MicroBlaze support in bn_mul.h which was causing the
+     build to fail. Found by zv-io. Fixes #1651.
 
 Changes
    * Support TLS testing in out-of-source builds using cmake.

include/mbedtls/bn_mul.h

diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
index cac3f14..7f8eb1a 100644
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
@@ -520,7 +520,7 @@
         "swi   r3,   %2         \n\t"   \
         : "=m" (c), "=m" (d), "=m" (s)              \
         : "m" (s), "m" (d), "m" (c), "m" (b)        \
-        : "r3", "r4"  "r5", "r6", "r7", "r8",       \
+        : "r3", "r4", "r5", "r6", "r7", "r8",       \
           "r9", "r10", "r11", "r12", "r13"          \
     );