From fee0436e24356229ebc75d22d056da8cde01b439 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 29 Jun 2011 15:19:42 -0400
Subject: [PATCH] bug 667130 - SIMD/THUMB2 detections fail under Android NDK5
 r=khuey

---
 configure.in        | 2 +-
 js/src/configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index aae0e4dafc5..f4828159136 100644
--- a/configure.in
+++ b/configure.in
@@ -6926,7 +6926,7 @@ dnl ========================================================
 
 dnl Defaults
 case "${target}" in
-arm-android-eabi)
+arm-android*|arm-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
diff --git a/js/src/configure.in b/js/src/configure.in
index a685f279d6b..a0dddaf0910 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4446,7 +4446,7 @@ dnl ========================================================
 
 dnl Defaults
 case "${target}" in
-arm-android-eabi)
+arm-android*|arm-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp