bug 722125 - NSPR always builds as armv5te on Android. Patch by Makoto Kato <m_kato@ga2.so-net.ne.jp>. r=me
authorted.mielczarek%gmail.com
Fri, 17 Feb 2012 14:47:56 +0000
changeset 4376 b5ad1cce3b3c2ee170b62b3101deef0319f9e6a7
parent 4375 252069ec1ee48e17f4c110b4209b5b28436a82fa
child 4377 8b9678b4dbd8d2ec87a340b7d887f708e257c3d4
push idunknown
push userunknown
push dateunknown
reviewersme
bugs722125
bug 722125 - NSPR always builds as armv5te on Android. Patch by Makoto Kato <m_kato@ga2.so-net.ne.jp>. r=me
configure
configure.in
--- a/configure
+++ b/configure
@@ -3200,24 +3200,24 @@ if test "${enable_os2_high_mem+set}" = s
         MOZ_OS2_HIGH_MEMORY=
       else
         MOZ_OS2_HIGH_MEMORY=1
       fi 
 fi
 
 
 
-case "${CPU_ARCH}-${OS_TARGET}" in
-arm-Android)
+case "$target" in
+arm*-android*|arm*-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
-arm-*)
+arm*-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no
         MOZ_ARCH=armv7-a
         MOZ_FLOAT_ABI=softfp
     fi
     if test "$MOZ_PLATFORM_MAEMO" = 6; then
         MOZ_THUMB=yes
     fi
--- a/configure.in
+++ b/configure.in
@@ -1004,24 +1004,24 @@ AC_ARG_ENABLE(os2-high-mem,
         MOZ_OS2_HIGH_MEMORY=1
       fi ])
 
 dnl ========================================================
 dnl = ARM toolchain tweaks
 dnl ========================================================
 
 dnl Defaults
-case "${CPU_ARCH}-${OS_TARGET}" in
-arm-Android)
+case "$target" in
+arm*-android*|arm*-linuxandroid*)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
-arm-*)
+arm*-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no
         MOZ_ARCH=armv7-a
         MOZ_FLOAT_ABI=softfp
     fi
     if test "$MOZ_PLATFORM_MAEMO" = 6; then
         MOZ_THUMB=yes
     fi