зеркало из https://github.com/mozilla/gecko-dev.git
Bug 632162 - specify hardware vfp flags for armv7. r=blassey, a=blocking-fennec
This commit is contained in:
Родитель
37c5c5eb1b
Коммит
7b5078c783
22
configure.in
22
configure.in
|
@ -297,8 +297,8 @@ if test "$target" = "arm-android-eabi" ; then
|
||||||
STRIP="$android_toolchain"/bin/arm-eabi-strip
|
STRIP="$android_toolchain"/bin/arm-eabi-strip
|
||||||
|
|
||||||
CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
|
CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
|
||||||
CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS"
|
CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
|
||||||
CXXFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CXXFLAGS"
|
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 -llog by default, since we use it all over the place.
|
||||||
dnl Add --allow-shlib-undefined, because libGLESv2 links to an
|
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
|
if test "$GNU_CC"; then
|
||||||
AC_DEFINE(MOZ_THUMB2)
|
AC_DEFINE(MOZ_THUMB2)
|
||||||
AC_DEFINE(MOZ_ARM_ARCH)
|
AC_DEFINE(MOZ_ARM_ARCH)
|
||||||
CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
|
CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
|
CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
|
ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
||||||
fi
|
fi
|
||||||
|
@ -7236,9 +7236,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; then
|
||||||
arm*)
|
arm*)
|
||||||
if test "$GNU_CC"; then
|
if test "$GNU_CC"; then
|
||||||
AC_DEFINE(MOZ_ARM_ARCH)
|
AC_DEFINE(MOZ_ARM_ARCH)
|
||||||
CFLAGS="$CFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"
|
CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"
|
CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
ASFLAGS="$ASFLAGS -march=armv7-a -marm"
|
ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
||||||
fi
|
fi
|
||||||
|
@ -7251,9 +7251,9 @@ else
|
||||||
case "$target_cpu" in
|
case "$target_cpu" in
|
||||||
arm*)
|
arm*)
|
||||||
if test "$GNU_CC"; then
|
if test "$GNU_CC"; then
|
||||||
CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
|
CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
|
CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
|
ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -288,8 +288,8 @@ if test "$target" = "arm-android-eabi" ; then
|
||||||
STRIP="$android_toolchain"/bin/arm-eabi-strip
|
STRIP="$android_toolchain"/bin/arm-eabi-strip
|
||||||
|
|
||||||
CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
|
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"
|
CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
|
||||||
CXXFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions -march=armv5te -mthumb-interwork $CXXFLAGS"
|
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 -llog by default, since we use it all over the place.
|
||||||
dnl Add --allow-shlib-undefined, because libGLESv2 links to an
|
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
|
if test "$GNU_CC"; then
|
||||||
AC_DEFINE(MOZ_THUMB2)
|
AC_DEFINE(MOZ_THUMB2)
|
||||||
AC_DEFINE(MOZ_ARM_ARCH)
|
AC_DEFINE(MOZ_ARM_ARCH)
|
||||||
CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
|
CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
|
CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
|
ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
||||||
fi
|
fi
|
||||||
|
@ -4697,9 +4697,9 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; then
|
||||||
arm*)
|
arm*)
|
||||||
if test "$GNU_CC"; then
|
if test "$GNU_CC"; then
|
||||||
AC_DEFINE(MOZ_ARM_ARCH)
|
AC_DEFINE(MOZ_ARM_ARCH)
|
||||||
CFLAGS="$CFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"
|
CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"
|
CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
ASFLAGS="$ASFLAGS -march=armv7-a -marm"
|
ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
||||||
fi
|
fi
|
||||||
|
@ -4712,9 +4712,9 @@ else
|
||||||
case "$target_cpu" in
|
case "$target_cpu" in
|
||||||
arm*)
|
arm*)
|
||||||
if test "$GNU_CC"; then
|
if test "$GNU_CC"; then
|
||||||
CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
|
CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork"
|
CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
|
ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Загрузка…
Ссылка в новой задаче