summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-12-21 02:40:31 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-12-21 12:54:42 (GMT)
commit9e77eafbd8a15bd22aa162cdff719690c9aa864d (patch)
tree0a7050188646370d7a2741f09b9b27bc328cca60
parent25347541025401e1d575c198348e2f99b8894ce3 (diff)
downloadbuildroot-9e77eafbd8a15bd22aa162cdff719690c9aa864d.tar.gz
buildroot-9e77eafbd8a15bd22aa162cdff719690c9aa864d.tar.bz2
ffmpeg: make ARM optimizations explicit
The ffmpeg configure script tries to autodetermine ARM optimizations by building a small code snippet with AS. If AS allows higher-level (>generic) assembly instructions then it passes and enables the relevant optimization path. Some toolchains allow/default to more than generic asm and then fail when the real code is built. Fixes: http://autobuild.buildroot.net/results/b6e1225a07a58cc7544e37bc55675be71e2b5088/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/ffmpeg/ffmpeg.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 90c1f1b..b018ea0 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -133,19 +133,26 @@ FFMPEG_DEPENDENCIES += host-nasm
endif
endif
-# ARM defaults to v5: clear if less, add extra if more
+# Explicitly disable everything that doesn't match for ARM
+# FFMPEG "autodetects" by compiling an extended instruction via AS
+# This works on compilers that aren't built for generic by default
ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
FFMPEG_CONF_OPT += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
FFMPEG_CONF_OPT += --enable-armv6
+else
+FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2
endif
-ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a8)$(BR2_cortex_a9),y)
+ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
FFMPEG_CONF_OPT += --enable-armvfp
+else
+FFMPEG_CONF_OPT += --disable-armvfp
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
FFMPEG_CONF_OPT += --enable-neon
endif
+
# Set powerpc altivec appropriately
ifeq ($(BR2_powerpc),y)
ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y)