bug 667130 - SIMD/THUMB2 detections fail under Android NDK5 r=khuey
authorBrad Lassey <blassey@mozilla.com>
Wed, 29 Jun 2011 15:19:42 -0400
changeset 72532 1b9de1c164559a72e1edd57f069234fa0831e22b
parent 72531 c7c6abdd64ab52d3bdea7efa59b8fd35130e8d4a
child 72533 b7b987a52c33bfc6e3372d83f36016b467888baf
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs667130
milestone7.0a1
bug 667130 - SIMD/THUMB2 detections fail under Android NDK5 r=khuey
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -6921,17 +6921,17 @@ if test $MOZ_PLATFORM_MAEMO; then
 fi
 
 dnl ========================================================
 dnl = ARM toolchain tweaks
 dnl ========================================================
 
 dnl Defaults
 case "${target}" in
-arm-android-eabi)
+arm-android*|arm-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
 arm*-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4441,17 +4441,17 @@ dnl ====================================
 MOZ_ARG_HEADER(Individual module options)
 
 dnl ========================================================
 dnl = ARM toolchain tweaks
 dnl ========================================================
 
 dnl Defaults
 case "${target}" in
-arm-android-eabi)
+arm-android*|arm-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
 arm*-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no