aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bakker <p.j.bakker@polarssl.org>2013-04-12 09:40:38 +0200
committerPaul Bakker <p.j.bakker@polarssl.org>2013-04-12 09:40:38 +0200
commitd4c5944212912deeb890de08c8aa8410380584c8 (patch)
treeec22f3c7e1ef7b41192b3e21c632c72fe24ab9c8
parent90f042d4cbdcbf398f347d5f7eef608cc11de5b5 (diff)
downloadmbedtls-d4c5944212912deeb890de08c8aa8410380584c8.zip
mbedtls-d4c5944212912deeb890de08c8aa8410380584c8.tar.gz
mbedtls-d4c5944212912deeb890de08c8aa8410380584c8.tar.bz2
Fixed MPI assembly for ARM when -O2 is used
GCC with -O2 or higher also needs to now about 'cc' in the clobber list. (cherry picked from commit eff2e6d4146b72637fbec2ea6b8b800b3f3d9980) Conflicts: ChangeLog
-rw-r--r--ChangeLog4
-rw-r--r--include/polarssl/bn_mul.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 50c270f..18be08a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
PolarSSL ChangeLog
+= Branch 1.2
+Bugfix
+ * Fix for MPI assembly for ARM
+
= Version 1.2.6 released 2013-03-11
Bugfix
* Fixed memory leak in ssl_free() and ssl_reset() for active session
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 6bb511d..cffcd6b 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -606,7 +606,7 @@
: "=m" (c), "=m" (d), "=m" (s) \
: "m" (s), "m" (d), "m" (c), "m" (b) \
: "r0", "r1", "r2", "r3", "r4", "r5", \
- "r6", "r7", "r8", "r9" \
+ "r6", "r7", "r8", "r9", "cc" \
);
#else
@@ -640,7 +640,7 @@
: "=m" (c), "=m" (d), "=m" (s) \
: "m" (s), "m" (d), "m" (c), "m" (b) \
: "r0", "r1", "r2", "r3", "r4", "r5", \
- "r6", "r7" \
+ "r6", "r7", "cc" \
);
#endif /* Thumb */