From ebb9cf9cc682bde8a53c1320688cb360e4c5cd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 10 Aug 2015 12:10:39 +0200
Subject: [PATCH] Fix compile error with armcc5 --gnu

---
 ChangeLog                 | 1 +
 include/polarssl/bn_mul.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 51f3049d0..b4bed6c19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Bugfix
      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
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index e2ff1204e..1210d36aa 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                        \