diff --git a/ChangeLog b/ChangeLog
index 70adb476a..245670ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ Bugfix
      (found by Benoit Lecocq).
    * Fix bug in Makefile that caused libmbedcrypto and libmbedx509 not to be
      installed (found by Rawi666).
+   * Fix compile error with armcc 5 with --gnu option.
 
 
 = mbed TLS 2.0.0 released 2015-07-13
diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
index d7a7ad130..e77103fea 100644
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
@@ -46,7 +46,8 @@
 #define asm __asm
 #endif
 
-#if defined(__GNUC__)
+/* armcc5 --gnu defined __GNUC__ but doesn't support GNU's extended asm */
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
 #if defined(__i386__)
 
 #define MULADDC_INIT                        \