From 7b5078c783480f166ecb7cef95c3b478a3088be3 Mon Sep 17 00:00:00 2001 From: Vladimir Vukicevic Date: Mon, 7 Feb 2011 22:13:23 -0800 Subject: [PATCH] Bug 632162 - specify hardware vfp flags for armv7. r=blassey, a=blocking-fennec --- configure.in | 22 +++++++++++----------- js/src/configure.in | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.in b/configure.in index 3075e412a993..77042b6c3591 100644 --- a/configure.in +++ b/configure.in @@ -297,8 +297,8 @@ if test "$target" = "arm-android-eabi" ; then STRIP="$android_toolchain"/bin/arm-eabi-strip CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS" - CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS" - CXXFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CXXFLAGS" + CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS" + CXXFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CXXFLAGS" dnl Add -llog by default, since we use it all over the place. dnl Add --allow-shlib-undefined, because libGLESv2 links to an @@ -7220,9 +7220,9 @@ if test -n "$MOZ_THUMB2"; then if test "$GNU_CC"; then AC_DEFINE(MOZ_THUMB2) AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" - ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" + CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" + CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" + ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" else AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) fi @@ -7236,9 +7236,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; then arm*) if test "$GNU_CC"; then AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm" - ASFLAGS="$ASFLAGS -march=armv7-a -marm" + CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" + CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" + ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" else AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) fi @@ -7251,9 +7251,9 @@ else case "$target_cpu" in arm*) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" - ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" + CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float" + CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float" + ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float" fi ;; esac diff --git a/js/src/configure.in b/js/src/configure.in index f23fba14c087..2a87767efe48 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -288,8 +288,8 @@ if test "$target" = "arm-android-eabi" ; then STRIP="$android_toolchain"/bin/arm-eabi-strip CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS" - CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions -march=armv5te -mthumb-interwork $CFLAGS" - CXXFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions -march=armv5te -mthumb-interwork $CXXFLAGS" + CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS" + CXXFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CXXFLAGS" dnl Add -llog by default, since we use it all over the place. dnl Add --allow-shlib-undefined, because libGLESv2 links to an @@ -4681,9 +4681,9 @@ if test -n "$MOZ_THUMB2"; then if test "$GNU_CC"; then AC_DEFINE(MOZ_THUMB2) AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" - ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" + CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" + CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" + ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" else AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) fi @@ -4697,9 +4697,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; then arm*) if test "$GNU_CC"; then AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm" - ASFLAGS="$ASFLAGS -march=armv7-a -marm" + CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" + CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" + ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16" else AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) fi @@ -4712,9 +4712,9 @@ else case "$target_cpu" in arm*) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" - ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" + CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float" + CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float" + ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float" fi ;; esac