mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
9e7c4702a1
mbedtls uses some instructions introduced in ARMv6 which are not
available in older architectures.
Fixes: 3f7dd06fd8 ("mbedtls: Update to 2.14.1")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
28 lines
956 B
Diff
28 lines
956 B
Diff
From 7aff5a70f3580426865b6c86437a3e47546d13f7 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 16 Dec 2018 13:02:49 +0100
|
|
Subject: [PATCH] bn_mul.h: Use optimized MULADDC code only on ARM >= 6
|
|
|
|
The optimized code uses umaal which was only introduced with ARMv6 and
|
|
is not available on older versions.
|
|
This broke compilation with arm926ej-s CPU for me.
|
|
|
|
Fixes: 16b1bd89326 ("bn_mul.h: add ARM DSP optimized MULADDC code")
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
include/mbedtls/bn_mul.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/include/mbedtls/bn_mul.h
|
|
+++ b/include/mbedtls/bn_mul.h
|
|
@@ -638,7 +638,8 @@
|
|
"r6", "r7", "r8", "r9", "cc" \
|
|
);
|
|
|
|
-#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)
|
|
+#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) && \
|
|
+ __TARGET_ARCH_ARM >= 6
|
|
|
|
#define MULADDC_INIT \
|
|
asm(
|