Commit f2cc02bf authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: activate thumb2 on ARMv7-a cpu, not only NEON ones

parent 8db3bdf8
...@@ -192,6 +192,7 @@ check_android_sdk() ...@@ -192,6 +192,7 @@ check_android_sdk()
[ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1 [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
add_make "ANDROID_ABI := ${ANDROID_ABI}" add_make "ANDROID_ABI := ${ANDROID_ABI}"
test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON" test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
} }
test -z "$PREFIX" || add_make "PREFIX := $PREFIX" test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
...@@ -211,7 +212,7 @@ case "${OS}" in ...@@ -211,7 +212,7 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD" add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else else
check_ios_sdk check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
fi fi
;; ;;
*bsd*) *bsd*)
......
...@@ -33,8 +33,8 @@ endif ...@@ -33,8 +33,8 @@ endif
ifdef ENABLE_SMALL ifdef ENABLE_SMALL
FFMPEGCONF += --enable-small --optflags=-O2 FFMPEGCONF += --enable-small --optflags=-O2
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
ifdef HAVE_NEON ifdef HAVE_ARMV7A
# XXX: assumes CPU >= cortex-a8, and thus thumb2 able # XXX: assumes > ARMv7-A, and thus thumb2-able
FFMPEGCONF += --enable-thumb FFMPEGCONF += --enable-thumb
endif endif
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment