Bug 820540 - Build more things with -funwind-tables when DMD is enabled on ARM. r=glandium

This allows our backtraces to trace into more files.

As part of this fix, fix typo in gfx/cairo/cairo/src/Makefile.in introduced in bug 785422.
This commit is contained in:
Justin Lebar 2012-12-12 11:15:35 -05:00
parent 2039da32f7
commit f59a238e0b
2 changed files with 26 additions and 4 deletions

View File

@ -14,7 +14,7 @@ LIBRARY_NAME = mozcairo
LIBXUL_LIBRARY = 1
ifdef GNU_CC
OS_CFLAGS := $(filter-out -pedantic,$(OX_CFLAGS))
OS_CFLAGS := $(filter-out -pedantic,$(OS_CFLAGS))
OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
ifeq ($(OS_TARGET),Android)
MODULE_OPTIMIZE_FLAGS = -O2

View File

@ -3473,6 +3473,7 @@ MOZ_ARG_ENABLE_BOOL(sm-fail-on-warnings,
AC_SUBST(FAIL_ON_WARNINGS)
dnl ========================================================
dnl = Enable trace malloc
dnl ========================================================
NS_TRACE_MALLOC=${MOZ_TRACE_MALLOC}
@ -3487,6 +3488,27 @@ if test "$NS_TRACE_MALLOC"; then
fi
AC_SUBST(NS_TRACE_MALLOC)
dnl ========================================================
dnl = Enable DMD
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(dmd,
[ --enable-dmd Enable DMD; also enables jemalloc and replace-malloc and disables DMDV],
MOZ_DMD=1,
MOZ_DMD= )
if test "$NS_TRACE_MALLOC"; then # trace-malloc disables DMD
MOZ_DMD=
fi
if test "$MOZ_DMD"; then
AC_DEFINE(MOZ_DMD)
if test "${CPU_ARCH}" = "arm"; then
CFLAGS="$CFLAGS -funwind-tables"
CXXFLAGS="$CXXFLAGS -funwind-tables"
fi
fi
dnl ========================================================
dnl = Enable jemalloc
dnl ========================================================
@ -3837,9 +3859,9 @@ if test -z "$SKIP_LIBRARY_CHECKS"; then
AC_LANG_RESTORE
fi
# Demangle only for debug or trace-malloc builds
# Demangle only for debug or trace-malloc or DMD builds
MOZ_DEMANGLE_SYMBOLS=
if test "$HAVE_DEMANGLE" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
if test "$HAVE_DEMANGLE" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC" -o "$MOZ_DMD"; then
MOZ_DEMANGLE_SYMBOLS=1
AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
fi
@ -4139,7 +4161,7 @@ if test "$JS_HAS_CTYPES"; then
AC_DEFINE(JS_HAS_CTYPES)
fi
if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC" -o "$MOZ_DMD"; then
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
fi