diff --git a/ChangeLog b/ChangeLog
index e65c977d8..c2b03e5af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,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 aa940a99d..b2eb1e8c7 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                        \