package/develop/mozjs/arm-nosoftfp.patch

   1 diff -r -U 2 -p a/js/src/configure b/js/src/configure
   2 --- a/js/src/configure  2011-10-14 18:27:00.000000000 -0400
   3 +++ b/js/src/configure  2011-10-14 18:37:07.264794994 -0400
   4 @@ -10741,5 +10741,5 @@ _SAVE_CFLAGS="$CFLAGS"
   5  if test "$GNU_CC"; then
   6    # gcc needs -mfpu=neon to recognize NEON instructions
   7 -  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
   8 +  CFLAGS="$CFLAGS -mfpu=neon"
   9  fi
  10  cat > conftest.$ac_ext <<EOF
  11 @@ -13407,7 +13407,7 @@ EOF
  12  EOF
  13
  14 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  15 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  16 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  17 +        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  18 +        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  19 +        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  20        else
  21          { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; }
  22 @@ -13426,7 +13426,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
  23  EOF
  24
  25 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  26 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  27 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  28 +        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
  29 +        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
  30 +        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
  31        else
  32          { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; }
  33 diff -r -U 2 -p a/js/src/configure.in b/js/src/configure.in
  34 --- a/js/src/configure.in       2011-03-31 15:08:36.000000000 -0400
  35 +++ b/js/src/configure.in       2011-10-14 18:37:40.496180956 -0400
  36 @@ -3551,5 +3551,5 @@ _SAVE_CFLAGS="$CFLAGS"
  37  if test "$GNU_CC"; then
  38    # gcc needs -mfpu=neon to recognize NEON instructions
  39 -  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
  40 +  CFLAGS="$CFLAGS -mfpu=neon"
  41  fi
  42  AC_TRY_COMPILE([],
  43 @@ -4688,7 +4688,7 @@ if test -n "$MOZ_THUMB2"; then
  44          AC_DEFINE(MOZ_THUMB2)
  45          AC_DEFINE(MOZ_ARM_ARCH)
  46 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  47 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  48 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  49 +        CFLAGS="$CFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  50 +        CXXFLAGS="$CXXFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  51 +        ASFLAGS="$ASFLAGS -mthumb $MOZ_ARM_VFP_FLAGS"
  52        else
  53          AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
  54 @@ -4704,7 +4704,7 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
  55        if test "$GNU_CC"; then
  56          AC_DEFINE(MOZ_ARM_ARCH)
  57 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  58 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  59 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
  60 +        CFLAGS="$CFLAGS $MOZ_ARM_VFP_FLAGS"
  61 +        CXXFLAGS="$CXXFLAGS $MOZ_ARM_VFP_FLAGS"
  62 +        ASFLAGS="$ASFLAGS $MOZ_ARM_VFP_FLAGS"
  63        else
  64          AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])