--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -213,16 +213,18 @@ EXE_DEF_FILE = browser.def
RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include/widget
endif
ifdef DEBUG
RCFLAGS += -DDEBUG
endif
RCFLAGS += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\"
endif
+LIBS += $(JEMALLOC_LIBS)
+
include $(topsrcdir)/config/rules.mk
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
endif
DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\"
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -157,17 +157,16 @@ MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
MOZ_ZIPWRITER = @MOZ_ZIPWRITER@
MOZ_MORK = @MOZ_MORK@
MOZ_MORKREADER = @MOZ_MORKREADER@
MOZ_NO_XPCOM_OBSOLETE = @MOZ_NO_XPCOM_OBSOLETE@
MOZ_NO_FAST_LOAD = @MOZ_NO_FAST_LOAD@
NS_PRINTING = @NS_PRINTING@
MOZ_CRASHREPORTER = @MOZ_CRASHREPORTER@
-MOZ_MOCHITEST = @MOZ_MOCHITEST@
MOZ_HELP_VIEWER = @MOZ_HELP_VIEWER@
MOC= @MOC@
TAR=@TAR@
# The MOZ_UI_LOCALE var is used to build a particular locale. Do *not*
# use the var to change any binary files. Do *not* use this var unless you
# write rules for the "clean-locale" and "locale" targets.
--- a/config/config.mk
+++ b/config/config.mk
@@ -148,16 +148,22 @@ OS_CONFIG := $(OS_ARCH)$(OS_RELEASE)
FINAL_LINK_LIBS = $(MOZDEPTH)/config/final-link-libs
FINAL_LINK_COMPS = $(MOZDEPTH)/config/final-link-comps
FINAL_LINK_COMP_NAMES = $(MOZDEPTH)/config/final-link-comp-names
MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
+ifdef MOZ_MEMORY
+ifneq ($(OS_ARCH),WINNT)
+JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
+endif
+endif
+
# determine debug-related options
_DEBUG_CFLAGS :=
_DEBUG_LDFLAGS :=
ifndef MOZ_DEBUG
# global debugging is disabled
# check if it was explicitly enabled for this module
ifneq (, $(findstring $(MODULE), $(MOZ_DEBUG_MODULES)))
@@ -501,16 +507,17 @@ DEHYDRA_SCRIPT = $(MOZILLA_SRCDIR)/xpcom
DEHYDRA_MODULES = \
$(MOZILLA_SRCDIR)/xpcom/analysis/final.js \
$(NULL)
TREEHYDRA_MODULES = \
$(MOZILLA_SRCDIR)/xpcom/analysis/outparams.js \
$(MOZILLA_SRCDIR)/xpcom/analysis/stack.js \
+ $(MOZILLA_SRCDIR)/xpcom/analysis/flow.js \
$(NULL)
DEHYDRA_ARGS = \
--topsrcdir=$(topsrcdir) \
--objdir=$(DEPTH) \
--dehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(DEHYDRA_MODULES))) \
--treehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(TREEHYDRA_MODULES))) \
$(NULL)
--- a/configure.in
+++ b/configure.in
@@ -1882,21 +1882,26 @@ case "$target" in
*-wince*)
MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
AR_LIST="$AR -list"
AR_EXTRACT="$AR -extract"
AR_DELETE="$AR d"
AR_FLAGS='-OUT:"$@"'
+ if test -z "$AS_BIN"; then
+ AS="$AS_BIN"
+ fi
DSO_CFLAGS=
DSO_PIC_CFLAGS=
DLL_SUFFIX=.dll
BIN_SUFFIX='.exe'
- RC=rc.exe
+ if test -z "$RC"; then
+ RC=rc.exe
+ fi
# certain versions of cygwin's makedepend barf on the
# #include <string> vs -I./dist/include/string issue so don't use it
SYSTEM_MAKEDEPEND=
HOST_CC=cl
HOST_CXX=cl
HOST_LD=link
HOST_AR='lib -OUT:$@'
@@ -2963,16 +2968,21 @@ EOF
else
VISIBILITY_FLAGS='-fvisibility=hidden'
fi # have visibility pragma bug
fi # have visibility pragma
fi # have visibility(default) attribute
fi # have visibility(hidden) attribute
fi # GNU_CC
+# visibility hidden flag for Sun Studio on Solaris
+if test -z "$GNU_CC" && test -z "$GNU_CXX" && test "$OS_ARCH" = "SunOS"; then
+VISIBILITY_FLAGS='-xldscope=hidden'
+fi # Sun Studio on Solaris
+
AC_SUBST(WRAP_SYSTEM_INCLUDES)
AC_SUBST(VISIBILITY_FLAGS)
dnl Checks for header files.
dnl ========================================================
AC_HEADER_DIRENT
case "$target_os" in
freebsd*)
@@ -4356,17 +4366,16 @@ MOZ_IPCD=
MOZ_JAVAXPCOM=
MOZ_JSDEBUGGER=1
MOZ_JSLOADER=1
MOZ_LDAP_XPCOM=
MOZ_LIBART_CFLAGS=
MOZ_LIBART_LIBS=
MOZ_MAIL_NEWS=
MOZ_MATHML=1
-MOZ_MOCHITEST=1
MOZ_MORK=1
MOZ_MORKREADER=
MOZ_AUTH_EXTENSION=1
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_NO_INSPECTOR_APIS=
MOZ_NO_XPCOM_OBSOLETE=
MOZ_NO_FAST_LOAD=
MOZ_OJI=
@@ -5107,17 +5116,17 @@ fi
AC_SUBST(MOZ_ENABLE_GNOMEUI)
AC_SUBST(MOZ_GNOMEUI_CFLAGS)
AC_SUBST(MOZ_GNOMEUI_LIBS)
dnl ========================================================
dnl = dbus support
dnl ========================================================
-if test "$MOZ_ENABLE_GTK2"
+if test "$MOZ_ENABLE_GTK2" || "$MOZ_ENABLE_QT"
then
MOZ_ENABLE_DBUS=1
MOZ_ARG_DISABLE_BOOL(dbus,
[ --disable-dbus Disable dbus support ],
MOZ_ENABLE_DBUS=,
MOZ_ENABLE_DBUS=1)
@@ -5368,25 +5377,16 @@ dnl ====================================
MOZ_ARG_DISABLE_BOOL(universalchardet,
[ --disable-universalchardet
Disable universal encoding detection],
MOZ_UNIVERSALCHARDET=,
MOZ_UNIVERSALCHARDET=1 )
dnl ========================================================
-dnl = Build mochitest JS/DOM tests (on by default)
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(mochitest,
-[ --disable-mochitest Disable mochitest harness],
- MOZ_MOCHITEST=,
- MOZ_MOCHITEST=1 )
-
-
-dnl ========================================================
dnl experimental ldap features
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(ldap-experimental,
[ --enable-ldap-experimental
Enable LDAP experimental features],
MOZ_LDAP_XPCOM_EXPERIMENTAL=1,
MOZ_LDAP_XPCOM_EXPERIMENTAL=)
@@ -7440,17 +7440,16 @@ AC_SUBST(IBMBIDI)
AC_SUBST(MOZ_UNIVERSALCHARDET)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_XPINSTALL)
AC_SUBST(MOZ_VIEW_SOURCE)
AC_SUBST(MOZ_SPELLCHECK)
AC_SUBST(MOZ_XPFE_COMPONENTS)
AC_SUBST(MOZ_USER_DIR)
AC_SUBST(MOZ_CRASHREPORTER)
-AC_SUBST(MOZ_MOCHITEST)
AC_SUBST(ENABLE_STRIP)
AC_SUBST(PKG_SKIP_STRIP)
AC_SUBST(USE_ELF_DYNSTR_GC)
AC_SUBST(USE_PREBINDING)
AC_SUBST(INCREMENTAL_LINKER)
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -205,16 +205,18 @@ RCFLAGS += -DMOZ_THUNDERBIRD
ifdef BUILD_STATIC_LIBS
RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include/widget
endif
ifdef DEBUG
RCFLAGS += -DDEBUG
endif
endif
+LIBS += $(JEMALLOC_LIBS)
+
include $(topsrcdir)/config/rules.mk
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
endif
ifdef BUILD_STATIC_LIBS
include $(topsrcdir)/config/static-rules.mk
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -170,16 +170,18 @@ ifeq ($(OS_ARCH),OS2)
RESFILE = splashos2.res
RCFLAGS += -i $(MOZILLA_SRCDIR)/toolkit/xre
ifdef BUILD_STATIC_LIBS
EXE_DEF_FILE = seamonkey.def
RCFLAGS += -DMOZ_STATIC_BUILD -i $(DIST)/include/widget
endif
endif
+LIBS += $(JEMALLOC_LIBS)
+
include $(topsrcdir)/config/rules.mk
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL
endif
ifdef BUILD_STATIC_LIBS
include $(topsrcdir)/config/static-rules.mk