From 56bb7440c284e34424fe36bb237c8efc22084d92 Mon Sep 17 00:00:00 2001
Date: Sun, 11 Nov 2012 20:12:11 +0100
Subject: [PATCH] Simple changes for ARMv6
---
b2g/config/mozconfigs/common.override | 2 ++
build/autoconf/android.m4 | 4 ++--
build/autoconf/arch.m4 | 16 ++++++++--------
js/src/build/autoconf/android.m4 | 4 ++--
js/src/build/autoconf/arch.m4 | 16 ++++++++--------
media/libvpx/vpx_config_arm-linux-gcc.h | 2 +-
6 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/b2g/config/mozconfigs/common.override b/b2g/config/mozconfigs/common.override
index b94b773..ac5e689 100644
--- a/b2g/config/mozconfigs/common.override
+++ b/b2g/config/mozconfigs/common.override
@@ -4,4 +4,6 @@
# This file is included at the bottom of all b2g mozconfigs
+ac_add_options --with-arch=armv6
+export MOZ_PKG_SPECIAL=armv6
. "$topsrcdir/build/mozconfig.common.override"
diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 26746c3..6c1cbfe 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -165,10 +165,10 @@ AC_DEFUN([MOZ_ANDROID_STLPORT],
if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
case "${CPU_ARCH}-${MOZ_ARCH}" in
arm-armv7*)
- ANDROID_CPU_ARCH=armeabi-v7a
+ ANDROID_CPU_ARCH=armeabi-v6l
;;
arm-*)
- ANDROID_CPU_ARCH=armeabi
+ ANDROID_CPU_ARCH=armeabi-v6l
;;
x86-*)
ANDROID_CPU_ARCH=x86
diff --git a/build/autoconf/arch.m4 b/build/autoconf/arch.m4
index 0310234..5ce38df 100644
--- a/build/autoconf/arch.m4
+++ b/build/autoconf/arch.m4
@@ -28,23 +28,23 @@ if test -z "$MOZ_ARCH"; then
dnl Defaults
case "${CPU_ARCH}-${OS_TARGET}" in
arm-Android)
- MOZ_THUMB=yes
- MOZ_ARCH=armv7-a
+ MOZ_THUMB=toolchain-default
+ MOZ_ARCH=toolchain-default
MOZ_FPU=vfp
- MOZ_FLOAT_ABI=softfp
+ MOZ_FLOAT_ABI=toolchain-default
;;
arm-Darwin)
MOZ_ARCH=toolchain-default
- MOZ_THUMB=yes
+ MOZ_THUMB=toolchain-default
;;
arm-*)
if test -n "$MOZ_PLATFORM_MAEMO"; then
- MOZ_THUMB=no
- MOZ_ARCH=armv7-a
- MOZ_FLOAT_ABI=softfp
+ MOZ_THUMB=toolchain-default
+ MOZ_ARCH=toolchain-default
+ MOZ_FLOAT_ABI=toolchain-default
fi
if test "$MOZ_PLATFORM_MAEMO" = 6; then
- MOZ_THUMB=yes
+ MOZ_THUMB=toolchain-default
fi
;;
esac
diff --git a/js/src/build/autoconf/android.m4 b/js/src/build/autoconf/android.m4
index 26746c3..6c1cbfe 100644
--- a/js/src/build/autoconf/android.m4
+++ b/js/src/build/autoconf/android.m4
@@ -165,10 +165,10 @@ AC_DEFUN([MOZ_ANDROID_STLPORT],
if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
case "${CPU_ARCH}-${MOZ_ARCH}" in
arm-armv7*)
- ANDROID_CPU_ARCH=armeabi-v7a
+ ANDROID_CPU_ARCH=armeabi-v6l
;;
arm-*)
- ANDROID_CPU_ARCH=armeabi
+ ANDROID_CPU_ARCH=armeabi-v6l
;;
x86-*)
ANDROID_CPU_ARCH=x86
diff --git a/js/src/build/autoconf/arch.m4 b/js/src/build/autoconf/arch.m4
index 0310234..5ce38df 100644
--- a/js/src/build/autoconf/arch.m4
+++ b/js/src/build/autoconf/arch.m4
@@ -28,23 +28,23 @@ if test -z "$MOZ_ARCH"; then
dnl Defaults
case "${CPU_ARCH}-${OS_TARGET}" in
arm-Android)
- MOZ_THUMB=yes
- MOZ_ARCH=armv7-a
+ MOZ_THUMB=toolchain-default
+ MOZ_ARCH=toolchain-default
MOZ_FPU=vfp
- MOZ_FLOAT_ABI=softfp
+ MOZ_FLOAT_ABI=toolchain-default
;;
arm-Darwin)
MOZ_ARCH=toolchain-default
- MOZ_THUMB=yes
+ MOZ_THUMB=toolchain-default
;;
arm-*)
if test -n "$MOZ_PLATFORM_MAEMO"; then
- MOZ_THUMB=no
- MOZ_ARCH=armv7-a
- MOZ_FLOAT_ABI=softfp
+ MOZ_THUMB=toolchain-default
+ MOZ_ARCH=toolchain-default
+ MOZ_FLOAT_ABI=toolchain-default
fi
if test "$MOZ_PLATFORM_MAEMO" = 6; then
- MOZ_THUMB=yes
+ MOZ_THUMB=toolchain-default
fi
;;
esac
diff --git a/media/libvpx/vpx_config_arm-linux-gcc.h b/media/libvpx/vpx_config_arm-linux-gcc.h
index 53a317c..6a3ff8c 100644
--- a/media/libvpx/vpx_config_arm-linux-gcc.h
+++ b/media/libvpx/vpx_config_arm-linux-gcc.h
@@ -17,7 +17,7 @@
#define ARCH_PPC64 0
#define HAVE_ARMV5TE 1
#define HAVE_ARMV6 1
-#define HAVE_ARMV7 1
+#define HAVE_ARMV7 0
#define HAVE_MIPS32 0
#define HAVE_MMX 0
#define HAVE_SSE 0
--
1.7.10.4