From 854dab96fe932fab42525952f0fc0c2f8a82c514 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:08:34 +0200
Subject: [PATCH] Fix the fix for armcc5 --gnu

Only exclude armcc5, not armcc6.
---
 include/mbedtls/bn_mul.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
index e77103fea..951024595 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                        \