[vlc-commits] Contribs: activate thumb2 on ARMv7-a cpu, not only NEON ones

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Oct  5 17:04:10 2012 +0200| [f2cc02bf5e73578970c289aa522f53baa149b67d] | committer: Jean-Baptiste Kempf

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2cc02bf5e73578970c289aa522f53baa149b67d
---

 contrib/bootstrap            |    3 ++-
 contrib/src/ffmpeg/rules.mak |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f8587a1..0567a57 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -192,6 +192,7 @@ check_android_sdk()
 	[ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
 	add_make "ANDROID_ABI := ${ANDROID_ABI}"
 	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"
@@ -211,7 +212,7 @@ case "${OS}" in
 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
 		else
 			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
 		;;
 	*bsd*)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 39a1a0c..04de268 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -33,8 +33,8 @@ endif
 ifdef ENABLE_SMALL
 FFMPEGCONF += --enable-small --optflags=-O2
 ifeq ($(ARCH),arm)
-ifdef HAVE_NEON
-# XXX: assumes CPU >= cortex-a8, and thus thumb2 able
+ifdef HAVE_ARMV7A
+# XXX: assumes > ARMv7-A, and thus thumb2-able
 FFMPEGCONF += --enable-thumb
 endif
 endif