--- comm-1.9.2/mail/installer/removed-files.in.old5	2010-05-28 11:57:41.434472713 +0800
+++ comm-1.9.2/mail/installer/removed-files.in	2010-05-28 11:58:04.032775995 +0800
@@ -295,7 +295,9 @@
 #endif
 .autoreg
 component.reg
+#ifndef SOLARIS
 @DLL_PREFIX@jemalloc@DLL_SUFFIX@
+#endif
 #ifdef XP_WIN
 #ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest
--- comm-1.9.2/mozilla/browser/installer/removed-files.in.old5	2010-05-28 11:53:18.397388923 +0800
+++ comm-1.9.2/mozilla/browser/installer/removed-files.in	2010-05-28 11:53:46.568024986 +0800
@@ -787,7 +787,9 @@
 chrome/icons/default/default.xpm
 dictionaries/PL.dic
 dictionaries/PL.aff
+#ifndef SOLARIS
 libjemalloc.so
+#endif
 icons/mozicon16.xpm
 icons/mozicon50.xpm
 #endif
--- comm-1.9.2/mozilla/memory/jemalloc/Makefile.in.old5	2010-05-28 11:50:46.547706148 +0800
+++ comm-1.9.2/mozilla/memory/jemalloc/Makefile.in	2010-05-28 11:51:32.464570863 +0800
@@ -114,13 +114,15 @@
 ifndef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -xO5
 endif
+OS_LDFLAGS += -z interpose
 endif
 
 LIBRARY_NAME	= jemalloc
 
 # Build jemalloc as a shared lib.  This is mandatory for Darwin, since a library
 # init function is used on that platform.
-ifeq ($(OS_ARCH),Darwin)
+# On Solaris, we want to have the ability to use LD_PRELOAD to override malloc.
+ifneq (,$(filter Darwin SunOS,$(OS_ARCH)))
 FORCE_SHARED_LIB= 1
 else
 DIST_INSTALL = 1