summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-06 21:41:47 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-06 21:44:08 +0200
commitd55c6b132e2f4835b6af6e5055c985ad5f715936 (patch)
treeef6cff68de93049b1723f4c454402f5420df5659
parent755d6cb0fef6cdce43608cde980686f247033a7c (diff)
downloadbuildroot-d55c6b132e2f4835b6af6e5055c985ad5f715936.tar.gz
buildroot-d55c6b132e2f4835b6af6e5055c985ad5f715936.zip
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>
-rw-r--r--package/opus/opus.mk6
1 files changed, 6 insertions, 0 deletions
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))
OpenPOWER on IntegriCloud