From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 22 Jun 2016 13:47:28 +0000 (-0300)
Subject: openssl: disable assembly for ARMv7M
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc89c4c5b0c9540d1935cd6a945b3a0908946db3;p=buildroot.git

openssl: disable assembly for ARMv7M

It requires interwork and v7M is thumb-only. Fixes:
http://autobuild.buildroot.net/results/55d/55dc9d6826defd2c9048c2991019d4d573d34af4/

[Peter: use R2_ARM_CPU_HAS_ARM for logic]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 2368aa913c..e34868e842 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -34,7 +34,8 @@ OPENSSL_DEPENDENCIES += ocf-linux
 endif
 
 # Some architectures are optimized in OpenSSL
-ifeq ($(ARCH),arm)
+# Doesn't work for thumb-only (Cortex-M?)
+ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
 OPENSSL_TARGET_ARCH = armv4
 endif
 ifeq ($(ARCH),aarch64)