20829N/Adiff --git a/config/jemalloc_solaris.map b/config/jemalloc_solaris.map
20829N/Anew file mode 100644
20829N/Aindex 0000000..7f4db39
20829N/A--- /dev/null
20829N/A+++ b/config/jemalloc_solaris.map
20829N/A@@ -0,0 +1,12 @@
20829N/A+{
20829N/A+ global:
20829N/A+ calloc = NODIRECT;
20829N/A+ free = NODIRECT;
20829N/A+ jemalloc_stats = NODIRECT;
20829N/A+ malloc = NODIRECT;
20829N/A+ malloc_usable_size = NODIRECT;
20829N/A+ memalign = NODIRECT;
20829N/A+ posix_memalign = NODIRECT;
20829N/A+ realloc = NODIRECT;
20829N/A+ valloc = NODIRECT;
20829N/A+};
20829N/Adiff --git a/js/src/config/jemalloc_solaris.map b/js/src/config/jemalloc_solaris.map
20829N/Anew file mode 100644
20829N/Aindex 0000000..7f4db39
20829N/A--- /dev/null
20829N/A+++ b/js/src/config/jemalloc_solaris.map
20829N/A@@ -0,0 +1,12 @@
20829N/A+{
20829N/A+ global:
20829N/A+ calloc = NODIRECT;
20829N/A+ free = NODIRECT;
20829N/A+ jemalloc_stats = NODIRECT;
20829N/A+ malloc = NODIRECT;
20829N/A+ malloc_usable_size = NODIRECT;
20829N/A+ memalign = NODIRECT;
20829N/A+ posix_memalign = NODIRECT;
20829N/A+ realloc = NODIRECT;
20829N/A+ valloc = NODIRECT;
20829N/A+};
20829N/Adiff --git a/config/config.mk b/config/config.mk
20829N/Aindex 8aef9e5..1ddeaad 100644
20829N/A--- a/config/config.mk
20829N/A+++ b/config/config.mk
20829N/A@@ -147,7 +147,7 @@
20829N/A MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
20829N/A
20829N/A ifdef MOZ_MEMORY
20829N/A-ifneq ($(OS_ARCH),WINNT)
20829N/A+ifneq (,$(filter-out WINNT SunOS,$(OS_ARCH)))
20829N/A JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
20829N/A # If we are linking jemalloc into a program, we want the jemalloc symbols
20829N/A # to be exported
20829N/Adiff --git a/js/src/config/config.mk b/js/src/config/config.mk
20829N/Aindex 8aef9e5..1ddeaad 100644
20829N/A--- a/js/src/config/config.mk
20829N/A+++ b/js/src/config/config.mk
20829N/A@@ -147,7 +147,7 @@
20829N/A MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
20829N/A
20829N/A ifdef MOZ_MEMORY
20829N/A-ifneq ($(OS_ARCH),WINNT)
20829N/A+ifneq (,$(filter-out WINNT SunOS,$(OS_ARCH)))
20829N/A JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
20829N/A # If we are linking jemalloc into a program, we want the jemalloc symbols
20829N/A # to be exported
20829N/Adiff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
20829N/Aindex 841a77b..bf10981 100644
20829N/A--- a/toolkit/library/Makefile.in
20829N/A+++ b/toolkit/library/Makefile.in
20829N/A@@ -246,6 +246,12 @@
20829N/A
20829N/A include $(srcdir)/libxul-rules.mk
20829N/A
20829N/A+ifdef MOZ_MEMORY
20829N/A+ifeq ($(OS_ARCH),SunOS)
20829N/A+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) -M $(topsrcdir)/config/jemalloc_solaris.map -z interpose
20829N/A+endif
20829N/A+endif
20829N/A+
20829N/A ifeq ($(OS_ARCH),OpenBSD)
20829N/A # Needed by nsAuthGSSAPI
20829N/A EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
20829N/Adiff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
20829N/Aindex 9421f4c..52a110b 100644
20829N/A--- a/xpcom/build/Makefile.in
20829N/A+++ b/xpcom/build/Makefile.in
20829N/A@@ -191,6 +191,14 @@ ifdef HAVE_CLOCK_MONOTONIC
20829N/A EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
20829N/A endif
20829N/A
20829N/A+ifndef MOZ_ENABLE_LIBXUL
20829N/A+ifdef MOZ_MEMORY
20829N/A+ifeq ($(OS_ARCH),SunOS)
20829N/A+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) -M $(topsrcdir)/config/jemalloc_solaris.map -z interpose
20829N/A+endif
20829N/A+endif
20829N/A+endif
20829N/A+
20829N/A ifeq ($(OS_ARCH),WINNT)
20829N/A OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version)
20829N/A ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))