diff mbox

openssl: disable assembly for ARMv7M

Message ID 1466603248-29352-1-git-send-email-gustavo@zacarias.com.ar
State Accepted
Commit cc89c4c5b0c9540d1935cd6a945b3a0908946db3
Headers show

Commit Message

Gustavo Zacarias June 22, 2016, 1:47 p.m. UTC
It requires interwork and v7M is thumb-only. Fixes:
http://autobuild.buildroot.net/results/55d/55dc9d6826defd2c9048c2991019d4d573d34af4/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/openssl/openssl.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Peter Korsgaard June 22, 2016, 2:59 p.m. UTC | #1
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

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

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 > ---
 >  package/openssl/openssl.mk | 3 ++-
 >  1 file changed, 2 insertions(+), 1 deletion(-)

 > diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
 > index 2368aa9..b019785 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 ($(ARCH)$(BR2_ARM_CPU_ARMV7M),arm)

We have BR2_ARM_CPU_HAS_ARM, so I changed it to use that and committed,
thanks.
diff mbox

Patch

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 2368aa9..b019785 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 ($(ARCH)$(BR2_ARM_CPU_ARMV7M),arm)
 OPENSSL_TARGET_ARCH = armv4
 endif
 ifeq ($(ARCH),aarch64)