aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-08 14:04:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-08 14:04:41 +0100
commitfa6bab785722d8a5eec4b5a9ec178563387b44db (patch)
treef610bd6d5d29fe06f58de59bbdd1dcadaf549d9d
parent840a002b69406dd486842b29006b41dda8887fa9 (diff)
parentf0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea (diff)
downloadffmpeg-fa6bab785722d8a5eec4b5a9ec178563387b44db.tar.gz
Merge commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea'
* commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea': configure: arm: set fast_clz and fast_unaligned in cpuflags section Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure b/configure
index 96555a5b3e..4af2fca73b 100755
--- a/configure
+++ b/configure
@@ -1587,8 +1587,8 @@ done
aligned_stack_if_any="ppc x86"
fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
-fast_clz_if_any="alpha armv5te avr32 mips ppc x86"
-fast_unaligned_if_any="armv6 ppc x86"
+fast_clz_if_any="alpha avr32 mips ppc x86"
+fast_unaligned_if_any="ppc x86"
inline_asm_deps="!tms470"
need_memalign="altivec neon sse"
@@ -2873,6 +2873,11 @@ elif enabled arm; then
;;
esac
+ case "$subarch" in
+ armv5t*) enable fast_clz ;;
+ armv[6-8]*) enable fast_clz fast_unaligned ;;
+ esac
+
elif enabled avr32; then
case $cpu in