commit a6901796f66d7d9638eddba5de3281bc604f95cf
author Aurelien Jarno <aurelien@aurel32.net> Sat Nov 03 00:46:06 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Sat Aug 03 14:22:32 2019 +0200
tree 05487f40e40670b73aed16940006790d0dd4d8e3
parent a60dc25e9f662d40b4026e89d667bb45e82d0eb3

bn_mul.h: require at least ARMv6 to enable the ARM DSP code

Commit 16b1bd89326e "bn_mul.h: add ARM DSP optimized MULADDC code"
added some ARM DSP instructions that was assumed to always be available
when __ARM_FEATURE_DSP is defined to 1. Unfortunately it appears that
the ARMv5TE architecture (GCC flag -march=armv5te) supports the DSP
instructions, but only in Thumb mode and not in ARM mode, despite
defining __ARM_FEATURE_DSP in both cases.

This patch fixes the build issue by requiring at least ARMv6 in addition
to the DSP feature.

include/mbedtls/bn_mul.h

diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
index c33bd8d..748975e 100644
--- a/include/mbedtls/bn_mul.h
+++ b/include/mbedtls/bn_mul.h
@@ -642,7 +642,8 @@
            "r6", "r7", "r8", "r9", "cc"         \
          );
 
-#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
+#elif (__ARM_ARCH >= 6) && \
+    defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
 
 #define MULADDC_INIT                            \
     asm(