Attachment #279711 for bug #374327




fi
AC_SUBST(HAVE_ARM_SIMD)

AC_CACHE_CHECK(for ARM EABI HARD,
    ac_cv_gcc_arm_eabi_hard,
    [AC_TRY_COMPILE([],
                      [
#if defined(__ARM_PCS_VFP)
  return 0;
#else
#error Not ARM EABI HARD.
#endif
    ],
    ac_cv_gcc_arm_eabi_hard="yes",
    ac_cv_gcc_arm_eabi_hard="no")])
if test "$ac_cv_gcc_arm_eabi_hard" == "no"; then
    SOFTFP_FLAGS="-mfloat-abi=softfp"
fi

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 $SOFTFP_FLAGS"
fi
# We try to link so that this also fails when
# building with LTO.

      if test "$GNU_CC"; then
        AC_DEFINE(MOZ_THUMB2)
        AC_DEFINE(MOZ_ARM_ARCH)
        CFLAGS="$CFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
      else
        AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
      fi

    arm*)
      if test "$GNU_CC"; then
        AC_DEFINE(MOZ_ARM_ARCH)
        CFLAGS="$CFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        ASFLAGS="$ASFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
      else
        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
      fi




fi
AC_SUBST(HAVE_ARM_SIMD)

AC_CACHE_CHECK(for ARM EABI HARD,
    ac_cv_gcc_arm_eabi_hard,
    [AC_TRY_COMPILE([],
                      [
#if defined(__ARM_PCS_VFP)
  return 0;
#else
#error Not ARM EABI HARD.
#endif
    ],
    ac_cv_gcc_arm_eabi_hard="yes",
    ac_cv_gcc_arm_eabi_hard="no")])
if test "$ac_cv_gcc_arm_eabi_hard" == "no"; then
    SOFTFP_FLAGS="-mfloat-abi=softfp"
fi

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 $SOFTFP_FLAGS"
fi
AC_TRY_COMPILE([],
               [asm("vadd.i8 d0, d0, d0");],

      if test "$GNU_CC"; then
        AC_DEFINE(MOZ_THUMB2)
        AC_DEFINE(MOZ_ARM_ARCH)
        CFLAGS="$CFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
      else
        AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
      fi

    arm*)
      if test "$GNU_CC"; then
        AC_DEFINE(MOZ_ARM_ARCH)
        CFLAGS="$CFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
        ASFLAGS="$ASFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
      else
        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
      fi

Lines 996-1003 Link Here

(-)a/toolkit/crashreporter/google-breakpad/src/client/windows/build/common.gypi (-2 / +2 lines)
996	['armv7==1', {	996	['armv7==1', {
997	'cflags': [	997	'cflags': [
998	'-march=armv7-a',	998	'-march=armv7-a',
999	'-mtune=cortex-a8',	999	'-mtune=cortex-a9',
1000	'-mfloat-abi=softfp',	1000	'-mfloat-abi=hard',
1001	],	1001	],
1002	'conditions': [	1002	'conditions': [
1003	['arm_neon==1', {	1003	['arm_neon==1', {

Return to bug 374327

Lines 3602-3612 if test "$result" = "yes"; then Link Here

(-)a/configure.in (-7 / +23 lines)
3602	fi	3602	fi
3603	AC_SUBST(HAVE_ARM_SIMD)	3603	AC_SUBST(HAVE_ARM_SIMD)
3604		3604
		3605	AC_CACHE_CHECK(for ARM EABI HARD,
		3606	ac_cv_gcc_arm_eabi_hard,
		3607	[AC_TRY_COMPILE([],
		3608	[
		3609	#if defined(__ARM_PCS_VFP)
		3610	return 0;
		3611	#else
		3612	#error Not ARM EABI HARD.
		3613	#endif
		3614	],
		3615	ac_cv_gcc_arm_eabi_hard="yes",
		3616	ac_cv_gcc_arm_eabi_hard="no")])
		3617	if test "$ac_cv_gcc_arm_eabi_hard" == "no"; then
		3618	SOFTFP_FLAGS="-mfloat-abi=softfp"
		3619	fi
		3620
3605	AC_MSG_CHECKING(for ARM NEON support in compiler)	3621	AC_MSG_CHECKING(for ARM NEON support in compiler)
3606	_SAVE_CFLAGS="$CFLAGS"	3622	_SAVE_CFLAGS="$CFLAGS"
3607	if test "$GNU_CC"; then	3623	if test "$GNU_CC"; then
3608	# gcc needs -mfpu=neon to recognize NEON instructions	3624	# gcc needs -mfpu=neon to recognize NEON instructions
3609	CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"	3625	CFLAGS="$CFLAGS -mfpu=neon $SOFTFP_FLAGS"
3610	fi	3626	fi
3611	# We try to link so that this also fails when	3627	# We try to link so that this also fails when
3612	# building with LTO.	3628	# building with LTO.
Lines 7165-7173 if test -n "$MOZ_THUMB2"; then Link Here
7165	if test "$GNU_CC"; then	7181	if test "$GNU_CC"; then
7166	AC_DEFINE(MOZ_THUMB2)	7182	AC_DEFINE(MOZ_THUMB2)
7167	AC_DEFINE(MOZ_ARM_ARCH)	7183	AC_DEFINE(MOZ_ARM_ARCH)
7168	CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7184	CFLAGS="$CFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7169	CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7185	CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7170	ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7186	ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7171	else	7187	else
7172	AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])	7188	AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
7173	fi	7189	fi
Lines 7181-7189 elif test "$MOZ_ARM_ARCH" = "armv7"; then Link Here
7181	arm*)	7197	arm*)
7182	if test "$GNU_CC"; then	7198	if test "$GNU_CC"; then
7183	AC_DEFINE(MOZ_ARM_ARCH)	7199	AC_DEFINE(MOZ_ARM_ARCH)
7184	CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7200	CFLAGS="$CFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7185	CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7201	CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7186	ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	7202	ASFLAGS="$ASFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
7187	else	7203	else
7188	AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])	7204	AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
7189	fi	7205	fi

Lines 3466-3476 if test "$result" = "yes"; then Link Here

(-)a/js/src/configure.in (-7 / +23 lines)
3466	fi	3466	fi
3467	AC_SUBST(HAVE_ARM_SIMD)	3467	AC_SUBST(HAVE_ARM_SIMD)
3468		3468
		3469	AC_CACHE_CHECK(for ARM EABI HARD,
		3470	ac_cv_gcc_arm_eabi_hard,
		3471	[AC_TRY_COMPILE([],
		3472	[
		3473	#if defined(__ARM_PCS_VFP)
		3474	return 0;
		3475	#else
		3476	#error Not ARM EABI HARD.
		3477	#endif
		3478	],
		3479	ac_cv_gcc_arm_eabi_hard="yes",
		3480	ac_cv_gcc_arm_eabi_hard="no")])
		3481	if test "$ac_cv_gcc_arm_eabi_hard" == "no"; then
		3482	SOFTFP_FLAGS="-mfloat-abi=softfp"
		3483	fi
		3484
3469	AC_MSG_CHECKING(for ARM NEON support in compiler)	3485	AC_MSG_CHECKING(for ARM NEON support in compiler)
3470	_SAVE_CFLAGS="$CFLAGS"	3486	_SAVE_CFLAGS="$CFLAGS"
3471	if test "$GNU_CC"; then	3487	if test "$GNU_CC"; then
3472	# gcc needs -mfpu=neon to recognize NEON instructions	3488	# gcc needs -mfpu=neon to recognize NEON instructions
3473	CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"	3489	CFLAGS="$CFLAGS -mfpu=neon $SOFTFP_FLAGS"
3474	fi	3490	fi
3475	AC_TRY_COMPILE([],	3491	AC_TRY_COMPILE([],
3476	[asm("vadd.i8 d0, d0, d0");],	3492	[asm("vadd.i8 d0, d0, d0");],
Lines 4607-4615 if test -n "$MOZ_THUMB2"; then Link Here
4607	if test "$GNU_CC"; then	4623	if test "$GNU_CC"; then
4608	AC_DEFINE(MOZ_THUMB2)	4624	AC_DEFINE(MOZ_THUMB2)
4609	AC_DEFINE(MOZ_ARM_ARCH)	4625	AC_DEFINE(MOZ_ARM_ARCH)
4610	CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4626	CFLAGS="$CFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4611	CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4627	CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4612	ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4628	ASFLAGS="$ASFLAGS -march=armv7-a -mthumb $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4613	else	4629	else
4614	AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])	4630	AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
4615	fi	4631	fi
Lines 4623-4631 elif test "$MOZ_ARM_ARCH" = "armv7"; then Link Here
4623	arm*)	4639	arm*)
4624	if test "$GNU_CC"; then	4640	if test "$GNU_CC"; then
4625	AC_DEFINE(MOZ_ARM_ARCH)	4641	AC_DEFINE(MOZ_ARM_ARCH)
4626	CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4642	CFLAGS="$CFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4627	CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4643	CXXFLAGS="$CXXFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4628	ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"	4644	ASFLAGS="$ASFLAGS -march=armv7-a -marm $SOFTFP_FLAGS $MOZ_ARM_VFP_FLAGS"
4629	else	4645	else
4630	AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])	4646	AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
4631	fi	4647	fi