author | Mike Hommey <mh+mozilla@glandium.org> |
Sat, 29 Jan 2011 09:30:17 +0100 | |
changeset 61586 | ef9290eb777b6ec2240449d8f41c74ba7dee8003 |
parent 61512 | 32542df68da39768b7d7e88014ac2e898f6fbded |
child 61587 | 94a51a3b64d40175c2d32419cbe467604f183f4d |
push id | 18399 |
push user | mh@glandium.org |
push date | Sat, 29 Jan 2011 08:33:55 +0000 |
treeherder | mozilla-central@94a51a3b64d4 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bustage |
milestone | 2.0b11pre |
backs out | 32542df68da39768b7d7e88014ac2e898f6fbded |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions | |
js/src/configure.in | file | annotate | diff | comparison | revisions | |
nsprpub/configure | file | annotate | diff | comparison | revisions | |
nsprpub/configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -7160,49 +7160,49 @@ 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 -Wa,-march=armv7-a -Wa,-mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + 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" 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 -Wa,-march=armv7-a -Wa,-marm" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa,-march=armv7-a -Wa,-marm" + 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" 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 -Wa,-march=armv5te -Wa,-mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" + 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" fi ;; esac fi AC_SUBST(MOZ_THUMB2) AC_SUBST(MOZ_ARM_ARCH)
--- a/js/src/configure.in +++ b/js/src/configure.in @@ -4675,49 +4675,49 @@ 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 -Wa,-march=armv7-a -Wa,-mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + 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" 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 -Wa,-march=armv7-a -Wa,-marm" - CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa,-march=armv7-a -Wa,-marm" + 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" 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 -Wa,-march=armv5te -Wa,-mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" + 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" fi ;; esac fi AC_SUBST(MOZ_THUMB2) AC_SUBST(MOZ_ARM_ARCH)
--- a/nsprpub/configure +++ b/nsprpub/configure @@ -3096,33 +3096,33 @@ if test "${enable_thumb2+set}" = set; th fi fi if test -n "$MOZ_THUMB2"; then case "$target_cpu" in arm*) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + 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" 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 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" + 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" fi ;; esac fi case "$host" in *-mingw*)
--- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -920,33 +920,33 @@ AC_ARG_ENABLE(thumb2, [ if test "$enableval" = "yes"; then MOZ_THUMB2=1, fi ]) if test -n "$MOZ_THUMB2"; then case "$target_cpu" in arm*) if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + 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" 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 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" + 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" fi ;; esac fi dnl ======================================================== dnl Override of system specific host options