commit 854dab96fe932fab42525952f0fc0c2f8a82c514
author Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Aug 10 12:08:34 2015 +0200
committer Manuel Pégourié-Gonnard <mpg2@elzevir.fr> Mon Aug 10 12:11:31 2015 +0200
tree 108c1a2dafd5ba059800dcb53d7ef9102131e5a6
parent ed46c436c0ec605d98359a1440e5f5feacf9ca7d

Fix the fix for armcc5 --gnu

Only exclude armcc5, not armcc6.

include/mbedtls/bn_mul.h

diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
index e77103f..9510245 100644
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
@@ -46,8 +46,9 @@
 #define asm __asm
 #endif
 
-/* armcc5 --gnu defined __GNUC__ but doesn't support GNU's extended asm */
-#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+/* 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                        \