mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
Bug 418016 - "Ts jumped ~1% when enabling jemalloc on Linux (qm-mini-ubuntu01, qm-mini-ubuntu02, qm-mini-ubuntu05)" (Revert jemalloc/libxul integration; makes this bug WONTFIX) [p=jasone@canonware.com (Jason Evans) a1.9=schrep]
This commit is contained in:
parent
8335c2e236
commit
822470b092
@ -73,7 +73,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBX
|
|||||||
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
||||||
|
|
||||||
ifdef MOZ_MEMORY
|
ifdef MOZ_MEMORY
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
ifneq ($(OS_ARCH),WINNT)
|
||||||
LIBS += -ljemalloc
|
LIBS += -ljemalloc
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_ARCH),SunOS)
|
ifeq ($(OS_ARCH),SunOS)
|
||||||
|
@ -91,15 +91,9 @@ endif
|
|||||||
|
|
||||||
LIBRARY_NAME = jemalloc
|
LIBRARY_NAME = jemalloc
|
||||||
|
|
||||||
ifeq (Darwin,$(OS_TARGET))
|
# Build jemalloc as a shared lib. This is mandatory for Darwin, since a library
|
||||||
# Build jemalloc as a shared lib, so that the library init function is executed.
|
# init function is used on that platform.
|
||||||
FORCE_SHARED_LIB= 1
|
FORCE_SHARED_LIB= 1
|
||||||
else
|
|
||||||
# Make jemalloc part of libxul, in order to reduce dynamic loading overhead.
|
|
||||||
MODULE = jemalloc
|
|
||||||
LIBXUL_LIBRARY = 1
|
|
||||||
FORCE_STATIC_LIB = 1
|
|
||||||
endif
|
|
||||||
|
|
||||||
CSRCS = \
|
CSRCS = \
|
||||||
jemalloc.c \
|
jemalloc.c \
|
||||||
|
@ -253,11 +253,3 @@ endif
|
|||||||
ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
|
ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
|
||||||
DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
|
DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_MEMORY
|
|
||||||
ifneq ($(OS_ARCH),WINNT)
|
|
||||||
ifneq ($(OS_ARCH),Darwin)
|
|
||||||
EXTRA_DSO_LDOPTS += $(DEPTH)/memory/jemalloc/$(LIB_PREFIX)jemalloc.$(LIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user