From db4843164340e965dc0e6168dbb59b3e795e511c Mon Sep 17 00:00:00 2001 From: Chris E Ferron Date: Mon, 12 Nov 2012 13:13:13 -0800 Subject: [PATCH] do-not-enforce-wrong-arm-flags --- js/src/configure | 96 ----------------------------------------------------- js/src/configure.in | 85 ----------------------------------------------- 2 files changed, 181 deletions(-) diff --git a/js/src/configure b/js/src/configure index 8a0543e..b2e599f 100755 --- a/js/src/configure +++ b/js/src/configure @@ -10633,42 +10633,6 @@ EOF fi -echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 -echo "configure:10638: checking for ARM NEON support in compiler" >&5 -_SAVE_CFLAGS="$CFLAGS" -if test "$GNU_CC"; then - # gcc needs -mfpu=neon to recognize NEON instructions - CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" -fi -cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - result="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - result="no" -fi -rm -f conftest* -echo "$ac_t"""$result"" 1>&6 -if test "$result" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ARM_NEON 1 -EOF - - HAVE_ARM_NEON=1 -fi -CFLAGS="$_SAVE_CFLAGS" - - case "$target_os" in darwin*) USE_PTHREADS=1 @@ -13292,66 +13256,6 @@ if test "${with_cpu_arch+set}" = set; then fi -if test -n "$MOZ_THUMB2"; then - case "$target_cpu" in - arm*) - if test "$MOZ_ARM_ARCH" != "armv7"; then - { echo "configure: error: --enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH" 1>&2; exit 1; } - fi - if test "$GNU_CC"; then - cat >> confdefs.h <<\EOF -#define MOZ_THUMB2 1 -EOF - - cat >> confdefs.h <<\EOF -#define MOZ_ARM_ARCH 1 -EOF - - CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - else - { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; } - fi - ;; - *) - { echo "configure: error: --enable-thumb2 is not supported for non-ARM CPU architectures" 1>&2; exit 1; } - ;; - esac -elif test "$MOZ_ARM_ARCH" = "armv7"; then - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - cat >> confdefs.h <<\EOF -#define MOZ_ARM_ARCH 1 -EOF - - CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - else - { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; } - fi - ;; - *) - { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-ARM CPU architectures" 1>&2; exit 1; } - ;; - esac -else - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - 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 -fi - - - - # Debugging and Optimizations if test -z "$MOZ_DEBUG_FLAGS"; then diff --git a/js/src/configure.in b/js/src/configure.in index 5d5365b..e9f3bb1 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -3546,23 +3546,6 @@ if test "$result" = "yes"; then fi AC_SUBST(HAVE_ARM_SIMD) -AC_MSG_CHECKING(for ARM NEON support in compiler) -_SAVE_CFLAGS="$CFLAGS" -if test "$GNU_CC"; then - # gcc needs -mfpu=neon to recognize NEON instructions - CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp" -fi -AC_TRY_COMPILE([], - [asm("vadd.i8 d0, d0, d0");], - result="yes", result="no") -AC_MSG_RESULT("$result") -if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_NEON) - HAVE_ARM_NEON=1 -fi -CFLAGS="$_SAVE_CFLAGS" -AC_SUBST(HAVE_ARM_NEON) - dnl ======================================================== dnl = pthread support dnl = Start by checking whether the system support pthreads @@ -4660,74 +4643,6 @@ case "$target_cpu" in MOZ_ARM_ARCH=armv7 ;; esac -dnl ======================================================== -dnl = Enable building the Thumb2 instruction set -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(thumb2, - [ --enable-thumb2 Enable Thumb2 instruction set (implies ARMv7)], - MOZ_THUMB2=1, - MOZ_THUMB2=) -if test -n "$MOZ_THUMB2"; then - MOZ_ARM_ARCH=armv7 -fi - -dnl ======================================================== -dnl = Enable building for ARM specific CPU features -dnl ======================================================== -MOZ_ARG_WITH_STRING(cpu-arch, -[ --with-cpu-arch=arch Use specific arm architecture CPU features, default armv7], - MOZ_ARM_ARCH=$withval) - -if test -n "$MOZ_THUMB2"; then - case "$target_cpu" in - arm*) - if test "$MOZ_ARM_ARCH" != "armv7"; then - AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH]) - fi - if test "$GNU_CC"; then - AC_DEFINE(MOZ_THUMB2) - AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - else - AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) - fi - ;; - *) - AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures]) - ;; - esac -elif test "$MOZ_ARM_ARCH" = "armv7"; then - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - AC_DEFINE(MOZ_ARM_ARCH) - CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS" - else - AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains]) - fi - ;; - *) - AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures]) - ;; - esac -else - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - 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 -fi - -AC_SUBST(MOZ_THUMB2) -AC_SUBST(MOZ_ARM_ARCH) dnl ======================================================== dnl = -- 2.7.4