|
17439
|
1 |
diff --git a/config/config.mk b/config/config.mk
|
|
|
2 |
index a20b686..fc6bf22 100644
|
|
|
3 |
--- a/config/config.mk
|
|
|
4 |
+++ b/config/config.mk
|
|
|
5 |
@@ -153,7 +153,7 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI
|
|
|
6 |
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
|
|
|
7 |
|
|
|
8 |
ifdef MOZ_MEMORY
|
|
|
9 |
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
|
|
10 |
+ifneq (,$(filter-out WINNT WINCE SunOS,$(OS_ARCH)))
|
|
|
11 |
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
|
|
|
12 |
endif
|
|
|
13 |
endif
|
|
|
14 |
diff --git a/config/rules.mk b/config/rules.mk
|
|
|
15 |
index 76c943e..df3866b 100644
|
|
|
16 |
--- a/config/rules.mk
|
|
|
17 |
+++ b/config/rules.mk
|
|
|
18 |
@@ -990,9 +990,9 @@ ifdef MSMANIFEST_TOOL
|
|
|
19 |
endif # MSVC with manifest tool
|
|
|
20 |
else
|
|
|
21 |
ifeq ($(CPP_PROG_LINK),1)
|
|
|
22 |
- $(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
|
|
|
23 |
+ $(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
|
|
|
24 |
else # ! CPP_PROG_LINK
|
|
|
25 |
- $(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
|
|
26 |
+ $(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
|
|
27 |
endif # CPP_PROG_LINK
|
|
|
28 |
endif # WINNT && !GNU_CC
|
|
|
29 |
endif # WINCE
|
|
|
30 |
@@ -1057,9 +1057,9 @@ ifdef MSMANIFEST_TOOL
|
|
|
31 |
endif # MSVC with manifest tool
|
|
|
32 |
else
|
|
|
33 |
ifeq ($(CPP_PROG_LINK),1)
|
|
|
34 |
- $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
35 |
+ $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
36 |
else
|
|
|
37 |
- $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
38 |
+ $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
39 |
endif # CPP_PROG_LINK
|
|
|
40 |
endif # WINNT && !GNU_CC
|
|
|
41 |
endif # WINCE
|
|
|
42 |
@@ -1333,7 +1333,7 @@ endif # MOZ_AUTO_DEPS
|
|
|
43 |
|
|
|
44 |
ifdef MOZ_MEMORY
|
|
|
45 |
ifeq ($(OS_ARCH),SunOS)
|
|
|
46 |
-SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
|
|
|
47 |
+SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) -M $(topsrcdir)/config/jemalloc_solaris.map -z interpose
|
|
|
48 |
endif
|
|
|
49 |
endif
|
|
|
50 |
|
|
|
51 |
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
|
|
|
52 |
index d006e0c..5980e09 100644
|
|
|
53 |
--- a/js/src/Makefile.in
|
|
|
54 |
+++ b/js/src/Makefile.in
|
|
|
55 |
@@ -294,7 +294,7 @@ EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
|
|
|
56 |
|
|
|
57 |
ifdef MOZ_MEMORY
|
|
|
58 |
ifeq ($(OS_ARCH),SunOS)
|
|
|
59 |
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
|
|
|
60 |
+EXTRA_DSO_LDOPTS += $(SOLARIS_JEMALLOC_LDFLAGS)
|
|
|
61 |
endif
|
|
|
62 |
endif
|
|
|
63 |
|
|
|
64 |
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
|
|
|
65 |
index a20b686..fc6bf22 100644
|
|
|
66 |
--- a/js/src/config/config.mk
|
|
|
67 |
+++ b/js/src/config/config.mk
|
|
|
68 |
@@ -153,7 +153,7 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI
|
|
|
69 |
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
|
|
|
70 |
|
|
|
71 |
ifdef MOZ_MEMORY
|
|
|
72 |
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
|
|
73 |
+ifneq (,$(filter-out WINNT WINCE SunOS,$(OS_ARCH)))
|
|
|
74 |
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
|
|
|
75 |
endif
|
|
|
76 |
endif
|
|
|
77 |
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
|
|
|
78 |
index 76c943e..df3866b 100644
|
|
|
79 |
--- a/js/src/config/rules.mk
|
|
|
80 |
+++ b/js/src/config/rules.mk
|
|
|
81 |
@@ -990,9 +990,9 @@ ifdef MSMANIFEST_TOOL
|
|
|
82 |
endif # MSVC with manifest tool
|
|
|
83 |
else
|
|
|
84 |
ifeq ($(CPP_PROG_LINK),1)
|
|
|
85 |
- $(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
|
|
|
86 |
+ $(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
|
|
|
87 |
else # ! CPP_PROG_LINK
|
|
|
88 |
- $(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
|
|
89 |
+ $(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
|
|
90 |
endif # CPP_PROG_LINK
|
|
|
91 |
endif # WINNT && !GNU_CC
|
|
|
92 |
endif # WINCE
|
|
|
93 |
@@ -1057,9 +1057,9 @@ ifdef MSMANIFEST_TOOL
|
|
|
94 |
endif # MSVC with manifest tool
|
|
|
95 |
else
|
|
|
96 |
ifeq ($(CPP_PROG_LINK),1)
|
|
|
97 |
- $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
98 |
+ $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
99 |
else
|
|
|
100 |
- $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
101 |
+ $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
|
|
102 |
endif # CPP_PROG_LINK
|
|
|
103 |
endif # WINNT && !GNU_CC
|
|
|
104 |
endif # WINCE
|
|
|
105 |
@@ -1333,7 +1333,7 @@ endif # MOZ_AUTO_DEPS
|
|
|
106 |
|
|
|
107 |
ifdef MOZ_MEMORY
|
|
|
108 |
ifeq ($(OS_ARCH),SunOS)
|
|
|
109 |
-SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib)
|
|
|
110 |
+SOLARIS_JEMALLOC_LDFLAGS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) -M $(topsrcdir)/config/jemalloc_solaris.map -z interpose
|
|
|
111 |
endif
|
|
|
112 |
endif
|
|
|
113 |
|
|
|
114 |
diff --git a/memory/jemalloc/Makefile.in b/memory/jemalloc/Makefile.in
|
|
|
115 |
index e54af6c..b0e8fe3 100644
|
|
|
116 |
--- a/memory/jemalloc/Makefile.in
|
|
|
117 |
+++ b/memory/jemalloc/Makefile.in
|
|
|
118 |
@@ -111,7 +111,7 @@ ifeq ($(OS_ARCH),SunOS)
|
|
|
119 |
ifndef GNU_CC
|
|
|
120 |
MODULE_OPTIMIZE_FLAGS = -xO5
|
|
|
121 |
endif
|
|
|
122 |
-OS_LDFLAGS += -z interpose
|
|
|
123 |
+OS_LDFLAGS += -M $(topsrcdir)/config/jemalloc_solaris.map -z interpose
|
|
|
124 |
endif
|
|
|
125 |
|
|
|
126 |
LIBRARY_NAME = jemalloc
|
|
|
127 |
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
|
|
|
128 |
index 8699b07..7e94a06 100644
|
|
|
129 |
--- a/toolkit/library/Makefile.in
|
|
|
130 |
+++ b/toolkit/library/Makefile.in
|
|
|
131 |
@@ -186,6 +186,11 @@ EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) $(MKSHLIB_FORCE_ALL) $(LIBXUL_
|
|
|
132 |
|
|
|
133 |
ifdef MOZ_ENABLE_LIBXUL
|
|
|
134 |
include $(srcdir)/libxul-rules.mk
|
|
|
135 |
+ifdef MOZ_MEMORY
|
|
|
136 |
+ifeq ($(OS_ARCH),SunOS)
|
|
|
137 |
+EXTRA_DSO_LDOPTS += $(SOLARIS_JEMALLOC_LDFLAGS)
|
|
|
138 |
+endif
|
|
|
139 |
+endif
|
|
|
140 |
else
|
|
|
141 |
EXTRA_DSO_LDOPTS += \
|
|
|
142 |
$(MOZ_COMPONENT_LIBS) \
|
|
|
143 |
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
|
|
|
144 |
index 180c1e4..68b6871 100644
|
|
|
145 |
--- a/xpcom/build/Makefile.in
|
|
|
146 |
+++ b/xpcom/build/Makefile.in
|
|
17797
|
147 |
@@ -197,6 +197,14 @@
|
|
|
148 |
endif
|
|
17439
|
149 |
endif
|
|
|
150 |
|
|
|
151 |
+ifndef MOZ_ENABLE_LIBXUL
|
|
|
152 |
+ifdef MOZ_MEMORY
|
|
|
153 |
+ifeq ($(OS_ARCH),SunOS)
|
|
|
154 |
+EXTRA_DSO_LDOPTS += $(SOLARIS_JEMALLOC_LDFLAGS)
|
|
|
155 |
+endif
|
|
|
156 |
+endif
|
|
|
157 |
+endif
|
|
|
158 |
+
|
|
|
159 |
ifeq ($(OS_ARCH),WINNT)
|
|
|
160 |
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version)
|
|
|
161 |
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
|
|
|
162 |
diff --git a/dev/null b/config/jemalloc_solaris.map
|
|
|
163 |
new file mode 100644
|
|
|
164 |
index 0000000..7f4db39
|
|
|
165 |
--- /dev/null
|
|
|
166 |
+++ b/config/jemalloc_solaris.map
|
|
|
167 |
@@ -0,0 +1,12 @@
|
|
|
168 |
+{
|
|
|
169 |
+ global:
|
|
|
170 |
+ calloc = NODIRECT;
|
|
|
171 |
+ free = NODIRECT;
|
|
|
172 |
+ jemalloc_stats = NODIRECT;
|
|
|
173 |
+ malloc = NODIRECT;
|
|
|
174 |
+ malloc_usable_size = NODIRECT;
|
|
|
175 |
+ memalign = NODIRECT;
|
|
|
176 |
+ posix_memalign = NODIRECT;
|
|
|
177 |
+ realloc = NODIRECT;
|
|
|
178 |
+ valloc = NODIRECT;
|
|
|
179 |
+};
|
|
|
180 |
diff --git a/dev/null b/js/src/config/jemalloc_solaris.map
|
|
|
181 |
new file mode 100644
|
|
|
182 |
index 0000000..7f4db39
|
|
|
183 |
--- /dev/null
|
|
|
184 |
+++ b/js/src/config/jemalloc_solaris.map
|
|
|
185 |
@@ -0,0 +1,12 @@
|
|
|
186 |
+{
|
|
|
187 |
+ global:
|
|
|
188 |
+ calloc = NODIRECT;
|
|
|
189 |
+ free = NODIRECT;
|
|
|
190 |
+ jemalloc_stats = NODIRECT;
|
|
|
191 |
+ malloc = NODIRECT;
|
|
|
192 |
+ malloc_usable_size = NODIRECT;
|
|
|
193 |
+ memalign = NODIRECT;
|
|
|
194 |
+ posix_memalign = NODIRECT;
|
|
|
195 |
+ realloc = NODIRECT;
|
|
|
196 |
+ valloc = NODIRECT;
|
|
|
197 |
+};
|