From d4c5944212912deeb890de08c8aa8410380584c8 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Fri, 12 Apr 2013 09:40:38 +0200
Subject: [PATCH] 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
---
 ChangeLog                 | 4 ++++
 include/polarssl/bn_mul.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50c270ff2..18be08ab7 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 6bb511db4..cffcd6bd4 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 */