Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 422055: use jemalloc on Solaris, patch by Ginn Chen <ginn.chen@sun.com>,

Browse Source 
r=ted, a=shaver


git-svn-id: svn://10.0.0.236/trunk@251895 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com 2008-05-28 18:42:32 +00:00
parent c8d6b84b89
commit 062bddef47
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/browser/app/Makefile.in
View File

@ -76,9 +76,6 @@ ifdef MOZ_MEMORY
ifneq ($(OS_ARCH),WINNT)
LIBS += -ljemalloc
endif
ifeq ($(OS_ARCH),SunOS)
SOLARIS_JEMALLOC_LDFLAGS = -L$(LIBXUL_DIST)/bin -lxul
endif
endif
ifdef LIBXUL_SDK

6
mozilla/config/rules.mk
View File

@ -1226,6 +1226,12 @@ endif # COMPILER_DEPEND
endif # MOZ_AUTO_DEPS
ifdef MOZ_MEMORY
ifeq ($(OS_ARCH),SunOS)
SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
endif
endif
# Rules for building native targets must come first because of the host_ prefix
host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
$(REPORT_BUILD)

6
mozilla/js/src/Makefile.in
View File

@ -206,6 +206,12 @@ include $(topsrcdir)/config/config.mk
EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
ifdef MOZ_MEMORY
ifeq ($(OS_ARCH),SunOS)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
endif
endif
# When using gcc the assembly is inlined in the C-file (see jslock.c)
ifeq ($(OS_ARCH),SunOS)
ifneq (86,$(findstring 86,$(OS_TEST)))

5
mozilla/xpcom/typelib/xpidl/Makefile.in
View File

@ -134,6 +134,11 @@ include $(topsrcdir)/config/rules.mk
CFLAGS += $(LIBIDL_CFLAGS)
# Do not link to jemalloc
ifeq ($(OS_ARCH),SunOS)
SOLARIS_JEMALLOC_LDFLAGS =
endif
# Compile directly against the static lib, so we can use xpidl during the build
# without the shared library path being set.
ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH)))

5
mozilla/xpcom/typelib/xpt/tools/Makefile.in
View File

@ -62,6 +62,11 @@ LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX)
include $(topsrcdir)/config/rules.mk
# Do not link to jemalloc
ifeq ($(OS_ARCH),SunOS)
SOLARIS_JEMALLOC_LDFLAGS =
endif
# Compile directly against the static lib, so we can use the tools
# during the build without the shared library path being set.
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))