commit ebb9cf9cc682bde8a53c1320688cb360e4c5cd00
author Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Aug 10 12:10:39 2015 +0200
committer Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Aug 10 16:41:50 2015 +0200
tree 5d637df5bbdddf022d96549fc0cb8b482b89181a
parent af39e3e5972238f8cebf69e617c1f1005033a014

Fix compile error with armcc5 --gnu

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 51f3049..b4bed6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
      Leisink).
    * Fix missing -static-ligcc when building shared libraries for Windows with
      make.
+   * Fix compile error with armcc5 --gnu.
 
 Changes
    * Add SSL_MIN_DHM_BYTES configuration parameter in config.h to choose the

include/polarssl/bn_mul.h

diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index e2ff120..1210d36 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -42,7 +42,9 @@
 
 #if defined(POLARSSL_HAVE_ASM)
 
-#if defined(__GNUC__)
+/* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
+#if defined(__GNUC__) && \
+    ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 )
 #if defined(__i386__)
 
 #define MULADDC_INIT                        \