From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 6 Jul 2016 19:41:47 +0000 (+0200)
Subject: opus: don't use assembly when on ARM, but without ARM instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d55c6b132e2f4835b6af6e5055c985ad5f715936;p=buildroot.git

opus: don't use assembly when on ARM, but without ARM instructions

The ARM assembly code in opus uses full ARM instructions, which won't
work on Thumb-2 only platforms such as ARMv7-M, so we disable the
assembly code in such situations.

Fixes:

  http://autobuild.buildroot.net/results/ffa12ab7abadd76901228fc82da24e81bb6da625/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/opus/opus.mk b/package/opus/opus.mk
index f746a2f828..71fdcb3f0c 100644
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -14,4 +14,10 @@ ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
 OPUS_CONF_OPTS += --enable-fixed-point
 endif
 
+# When we're on ARM, but we don't have ARM instructions (only
+# Thumb-2), disable the usage of assembly as it is not Thumb-ready.
+ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_ARM_CPU_HAS_ARM),y:)
+OPUS_CONF_OPTS += --disable-asm
+endif
+
 $(eval $(autotools-package))