nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 422055: use jemalloc on Solaris, r=ted, a=shaver

Browse source
This commit is contained in:
gavin@gavinsharp.com 2008-05-28 11:42:31 -07:00
parent 09094d52b2
commit 221838708e
5 changed files with 22 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
browser/app/Makefile.in
View file

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

6
config/rules.mk
View file

@ -1226,6 +1226,12 @@ endif # COMPILER_DEPEND
endif # MOZ_AUTO_DEPS 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 # Rules for building native targets must come first because of the host_ prefix
host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
$(REPORT_BUILD) $(REPORT_BUILD)

6
js/src/Makefile.in
View file

@ -206,6 +206,12 @@ include $(topsrcdir)/config/config.mk
EXTRA_DSO_LDOPTS += $(NSPR_LIBS) 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) # When using gcc the assembly is inlined in the C-file (see jslock.c)
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq (86,$(findstring 86,$(OS_TEST))) ifneq (86,$(findstring 86,$(OS_TEST)))

5
xpcom/typelib/xpidl/Makefile.in
View file

@ -134,6 +134,11 @@ include $(topsrcdir)/config/rules.mk
CFLAGS += $(LIBIDL_CFLAGS) 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 # Compile directly against the static lib, so we can use xpidl during the build
# without the shared library path being set. # without the shared library path being set.
ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH))) ifneq (,$(filter WINNT WINCE OS2,$(OS_ARCH)))

5
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 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 # Compile directly against the static lib, so we can use the tools
# during the build without the shared library path being set. # during the build without the shared library path being set.
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))