summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-03-27 21:16:22 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-03-29 13:16:39 +0100
commit5537394821c750ed82e01d3eea8659878785869e (patch)
tree60ba76d90a756955437248f8b1ab4fab4ad315de /meta-oe
parent0e8a235d91742815016215dfcf1cb9797fd24501 (diff)
downloadmeta-openembedded-5537394821c750ed82e01d3eea8659878785869e.tar.gz
gperftools: add 2.0
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch580
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools_2.0.bb13
2 files changed, 593 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/gperftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch b/meta-oe/recipes-support/gperftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch
new file mode 100644
index 000000000..cbd4a08fb
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch
@@ -0,0 +1,580 @@
1Upstream-Status: backport
2
3From baaf0188295582ca68df03f70baa13d96a88e2eb Mon Sep 17 00:00:00 2001
4From: "chappedm@gmail.com" <chappedm@gmail.com>
5Date: Sun, 4 Nov 2012 17:41:47 +0000
6Subject: [PATCH] issue-473: Fix for make install error regarding src/windows/google/tcmalloc.h
7
8git-svn-id: http://gperftools.googlecode.com/svn/trunk@174 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
9---
10 Makefile.am | 20 +++----
11 Makefile.in | 194 ++++++++++++++++++++++++++++++------------------------------
12 2 files changed, 106 insertions(+), 108 deletions(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index d1cc29d..f932e8d 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -126,8 +126,7 @@ googleinclude_HEADERS = \
19 src/google/malloc_hook_c.h \
20 src/google/profiler.h \
21 src/google/stacktrace.h \
22- src/google/tcmalloc.h \
23- src/windows/google/tcmalloc.h
24+ src/google/tcmalloc.h
25
26 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
27 # This is for HTML and other documentation you want to install.
28@@ -437,9 +436,8 @@ S_TCMALLOC_MINIMAL_INCLUDES = src/common.h \
29 SG_TCMALLOC_MINIMAL_INCLUDES = src/gperftools/malloc_hook.h \
30 src/gperftools/malloc_hook_c.h \
31 src/gperftools/malloc_extension.h \
32- src/gperftools/malloc_extension_c.h \
33- src/gperftools/stacktrace.h
34-TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
35+ src/gperftools/malloc_extension_c.h
36+TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) $(SG_STACKTRACE_INCLUDES)
37 perftoolsinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
38
39 ### Making the library
40@@ -847,10 +845,10 @@ S_TCMALLOC_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) \
41 src/base/sysinfo.h \
42 src/base/thread_lister.h \
43 src/heap-profile-table.h
44-SG_TCMALLOC_INCLUDES = $(SG_TCMALLOC_MINIMAL_INCLUDES) \
45- src/gperftools/heap-profiler.h \
46+SG_TCMALLOC_INCLUDES = src/gperftools/heap-profiler.h \
47 src/gperftools/heap-checker.h
48-TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_INCLUDES)
49+TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) \
50+ $(SG_TCMALLOC_INCLUDES) $(SG_STACKTRACE_INCLUDES)
51 perftoolsinclude_HEADERS += $(SG_TCMALLOC_INCLUDES)
52
53 ### Making the library
54@@ -1191,9 +1189,9 @@ S_CPU_PROFILER_INCLUDES = src/profiledata.h \
55 src/base/sysinfo.h \
56 $(SPINLOCK_INCLUDES) \
57 $(LOGGING_INCLUDES)
58-SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h \
59- src/gperftools/stacktrace.h
60-CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
61+SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h
62+CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES) \
63+ $(SG_STACKTRACE_INCLUDES)
64 perftoolsinclude_HEADERS += $(SG_CPU_PROFILER_INCLUDES)
65
66 ### Making the library
67diff --git a/Makefile.in b/Makefile.in
68index 191754d..9550535 100644
69--- a/Makefile.in
70+++ b/Makefile.in
71@@ -349,7 +349,7 @@ am__libprofiler_la_SOURCES_DIST = src/profiler.cc \
72 @WITH_CPU_PROFILER_TRUE@am__objects_2 = $(am__objects_1) \
73 @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
74 @WITH_CPU_PROFILER_TRUE@am__objects_3 = $(am__objects_2) \
75-@WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
76+@WITH_CPU_PROFILER_TRUE@ $(am__objects_1) $(am__objects_1)
77 @WITH_CPU_PROFILER_TRUE@am_libprofiler_la_OBJECTS = profiler.lo \
78 @WITH_CPU_PROFILER_TRUE@ profile-handler.lo profiledata.lo \
79 @WITH_CPU_PROFILER_TRUE@ $(am__objects_3)
80@@ -439,26 +439,27 @@ am__libtcmalloc_la_SOURCES_DIST = src/tcmalloc.cc src/common.h \
81 src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
82 src/gperftools/malloc_extension.h \
83 src/gperftools/malloc_extension_c.h \
84- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
85- src/gperftools/heap-checker.h src/base/thread_lister.c \
86+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
87+ src/gperftools/stacktrace.h src/base/thread_lister.c \
88 src/base/linuxthreads.cc src/heap-checker.cc \
89 src/heap-checker-bcad.cc
90 @MINGW_FALSE@am__objects_5 = libtcmalloc_la-tcmalloc.lo
91 am__objects_6 = $(am__objects_1)
92 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_7 = $(am__objects_6) \
93 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
94-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_8 = $(am__objects_1)
95-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_9 = $(am__objects_7) \
96-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8)
97-@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_10 = thread_lister.lo \
98+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_8 = $(am__objects_7) \
99+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1) \
100+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1) \
101+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
102+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_9 = thread_lister.lo \
103 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-linuxthreads.lo \
104 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-heap-checker.lo \
105 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-heap-checker-bcad.lo
106-@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_11 = $(am__objects_10)
107+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_10 = $(am__objects_9)
108 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_la_OBJECTS = \
109 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_5) \
110-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
111-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_11)
112+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
113+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_10)
114 libtcmalloc_la_OBJECTS = $(am_libtcmalloc_la_OBJECTS)
115 libtcmalloc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
116 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
117@@ -502,29 +503,29 @@ am__libtcmalloc_and_profiler_la_SOURCES_DIST = src/tcmalloc.cc \
118 src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
119 src/gperftools/malloc_extension.h \
120 src/gperftools/malloc_extension_c.h \
121- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
122- src/gperftools/heap-checker.h src/base/thread_lister.c \
123+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
124+ src/gperftools/stacktrace.h src/base/thread_lister.c \
125 src/base/linuxthreads.cc src/heap-checker.cc \
126 src/heap-checker-bcad.cc src/profiler.cc \
127 src/profile-handler.cc src/profiledata.cc src/profiledata.h \
128 src/profile-handler.h src/getpc.h src/base/simple_mutex.h \
129 src/gperftools/profiler.h
130-@MINGW_FALSE@am__objects_12 = libtcmalloc_and_profiler_la-tcmalloc.lo
131-@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_13 = thread_lister.lo \
132+@MINGW_FALSE@am__objects_11 = libtcmalloc_and_profiler_la-tcmalloc.lo
133+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_12 = thread_lister.lo \
134 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-linuxthreads.lo \
135 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-heap-checker.lo \
136 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-heap-checker-bcad.lo
137-@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_14 = $(am__objects_13)
138-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_15 = \
139-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_12) \
140-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
141-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_14)
142-@WITH_CPU_PROFILER_TRUE@am__objects_16 = libtcmalloc_and_profiler_la-profiler.lo \
143+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_13 = $(am__objects_12)
144+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_14 = \
145+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_11) \
146+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
147+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_13)
148+@WITH_CPU_PROFILER_TRUE@am__objects_15 = libtcmalloc_and_profiler_la-profiler.lo \
149 @WITH_CPU_PROFILER_TRUE@ libtcmalloc_and_profiler_la-profile-handler.lo \
150 @WITH_CPU_PROFILER_TRUE@ libtcmalloc_and_profiler_la-profiledata.lo \
151 @WITH_CPU_PROFILER_TRUE@ $(am__objects_3)
152-@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_and_profiler_la_OBJECTS = $(am__objects_15) \
153-@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_16)
154+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_and_profiler_la_OBJECTS = $(am__objects_14) \
155+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_15)
156 libtcmalloc_and_profiler_la_OBJECTS = \
157 $(am_libtcmalloc_and_profiler_la_OBJECTS)
158 libtcmalloc_and_profiler_la_LINK = $(LIBTOOL) --tag=CXX \
159@@ -568,15 +569,15 @@ am__libtcmalloc_debug_la_SOURCES_DIST = src/debugallocation.cc \
160 src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
161 src/gperftools/malloc_extension.h \
162 src/gperftools/malloc_extension_c.h \
163- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
164- src/gperftools/heap-checker.h
165-@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_17 = thread_lister.lo \
166+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
167+ src/gperftools/stacktrace.h
168+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_16 = thread_lister.lo \
169 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-linuxthreads.lo \
170 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-heap-checker.lo \
171 @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-heap-checker-bcad.lo
172 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_debug_la_OBJECTS = libtcmalloc_debug_la-debugallocation.lo \
173-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_17) \
174-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9)
175+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_16) \
176+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8)
177 libtcmalloc_debug_la_OBJECTS = $(am_libtcmalloc_debug_la_OBJECTS)
178 libtcmalloc_debug_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
179 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
180@@ -628,12 +629,12 @@ am__libtcmalloc_internal_la_SOURCES_DIST = src/common.cc \
181 src/gperftools/heap-checker.h src/base/low_level_alloc.cc \
182 src/heap-profile-table.cc src/heap-profiler.cc \
183 src/raw_printer.cc src/memory_region_map.cc
184-@MINGW_FALSE@am__objects_18 = libtcmalloc_internal_la-system-alloc.lo
185-@MINGW_FALSE@am__objects_19 = \
186+@MINGW_FALSE@am__objects_17 = libtcmalloc_internal_la-system-alloc.lo
187+@MINGW_FALSE@am__objects_18 = \
188 @MINGW_FALSE@ libtcmalloc_internal_la-maybe_threads.lo
189-am__objects_20 = $(am__objects_6) $(am__objects_1)
190-am__objects_21 = libtcmalloc_internal_la-common.lo \
191- libtcmalloc_internal_la-internal_logging.lo $(am__objects_18) \
192+am__objects_19 = $(am__objects_6) $(am__objects_1) $(am__objects_1)
193+am__objects_20 = libtcmalloc_internal_la-common.lo \
194+ libtcmalloc_internal_la-internal_logging.lo $(am__objects_17) \
195 libtcmalloc_internal_la-memfs_malloc.lo \
196 libtcmalloc_internal_la-central_freelist.lo \
197 libtcmalloc_internal_la-page_heap.lo \
198@@ -644,11 +645,11 @@ am__objects_21 = libtcmalloc_internal_la-common.lo \
199 libtcmalloc_internal_la-symbolize.lo \
200 libtcmalloc_internal_la-thread_cache.lo \
201 libtcmalloc_internal_la-malloc_hook.lo \
202- libtcmalloc_internal_la-malloc_extension.lo $(am__objects_19) \
203- $(am__objects_20)
204+ libtcmalloc_internal_la-malloc_extension.lo $(am__objects_18) \
205+ $(am__objects_19)
206 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_internal_la_OBJECTS = \
207-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_21) \
208-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
209+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_20) \
210+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
211 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-low_level_alloc.lo \
212 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-heap-profile-table.lo \
213 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-heap-profiler.lo \
214@@ -690,9 +691,9 @@ am__libtcmalloc_minimal_la_SOURCES_DIST = src/tcmalloc.cc src/common.h \
215 src/gperftools/malloc_extension.h \
216 src/gperftools/malloc_extension_c.h \
217 src/gperftools/stacktrace.h
218-@MINGW_FALSE@am__objects_22 = libtcmalloc_minimal_la-tcmalloc.lo
219-am_libtcmalloc_minimal_la_OBJECTS = $(am__objects_22) \
220- $(am__objects_20)
221+@MINGW_FALSE@am__objects_21 = libtcmalloc_minimal_la-tcmalloc.lo
222+am_libtcmalloc_minimal_la_OBJECTS = $(am__objects_21) \
223+ $(am__objects_19)
224 libtcmalloc_minimal_la_OBJECTS = $(am_libtcmalloc_minimal_la_OBJECTS)
225 libtcmalloc_minimal_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
226 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
227@@ -730,7 +731,7 @@ am__libtcmalloc_minimal_debug_la_SOURCES_DIST = \
228 src/gperftools/malloc_extension_c.h \
229 src/gperftools/stacktrace.h
230 @WITH_DEBUGALLOC_TRUE@am_libtcmalloc_minimal_debug_la_OBJECTS = libtcmalloc_minimal_debug_la-debugallocation.lo \
231-@WITH_DEBUGALLOC_TRUE@ $(am__objects_20)
232+@WITH_DEBUGALLOC_TRUE@ $(am__objects_19)
233 libtcmalloc_minimal_debug_la_OBJECTS = \
234 $(am_libtcmalloc_minimal_debug_la_OBJECTS)
235 libtcmalloc_minimal_debug_la_LINK = $(LIBTOOL) --tag=CXX \
236@@ -773,14 +774,14 @@ am__libtcmalloc_minimal_internal_la_SOURCES_DIST = src/common.cc \
237 src/gperftools/malloc_extension.h \
238 src/gperftools/malloc_extension_c.h \
239 src/gperftools/stacktrace.h
240-@MINGW_FALSE@am__objects_23 = \
241+@MINGW_FALSE@am__objects_22 = \
242 @MINGW_FALSE@ libtcmalloc_minimal_internal_la-system-alloc.lo
243-@MINGW_FALSE@am__objects_24 = \
244+@MINGW_FALSE@am__objects_23 = \
245 @MINGW_FALSE@ libtcmalloc_minimal_internal_la-maybe_threads.lo
246 am_libtcmalloc_minimal_internal_la_OBJECTS = \
247 libtcmalloc_minimal_internal_la-common.lo \
248 libtcmalloc_minimal_internal_la-internal_logging.lo \
249- $(am__objects_23) \
250+ $(am__objects_22) \
251 libtcmalloc_minimal_internal_la-memfs_malloc.lo \
252 libtcmalloc_minimal_internal_la-central_freelist.lo \
253 libtcmalloc_minimal_internal_la-page_heap.lo \
254@@ -792,7 +793,7 @@ am_libtcmalloc_minimal_internal_la_OBJECTS = \
255 libtcmalloc_minimal_internal_la-thread_cache.lo \
256 libtcmalloc_minimal_internal_la-malloc_hook.lo \
257 libtcmalloc_minimal_internal_la-malloc_extension.lo \
258- $(am__objects_24) $(am__objects_20)
259+ $(am__objects_23) $(am__objects_19)
260 libtcmalloc_minimal_internal_la_OBJECTS = \
261 $(am_libtcmalloc_minimal_internal_la_OBJECTS)
262 libtcmalloc_minimal_internal_la_LINK = $(LIBTOOL) --tag=CXX \
263@@ -878,10 +879,10 @@ am__addressmap_unittest_SOURCES_DIST = \
264 src/base/basictypes.h src/base/dynamic_annotations.h \
265 src/third_party/valgrind.h src/windows/port.h \
266 src/windows/port.cc
267-@MINGW_TRUE@am__objects_25 = addressmap_unittest-port.$(OBJEXT)
268+@MINGW_TRUE@am__objects_24 = addressmap_unittest-port.$(OBJEXT)
269 am_addressmap_unittest_OBJECTS = \
270 addressmap_unittest-addressmap_unittest.$(OBJEXT) \
271- $(am__objects_6) $(am__objects_25)
272+ $(am__objects_6) $(am__objects_24)
273 addressmap_unittest_OBJECTS = $(am_addressmap_unittest_OBJECTS)
274 addressmap_unittest_DEPENDENCIES = liblogging.la
275 addressmap_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
276@@ -940,10 +941,10 @@ am__heap_checker_debug_unittest_SOURCES_DIST = \
277 src/base/googleinit.h src/gperftools/heap-checker.h \
278 src/base/logging.h src/base/basictypes.h \
279 src/base/dynamic_annotations.h src/third_party/valgrind.h
280-@WITH_HEAP_CHECKER_TRUE@am__objects_26 = $(am__objects_1)
281-@WITH_HEAP_CHECKER_TRUE@am__objects_27 = heap_checker_debug_unittest-heap-checker_unittest.$(OBJEXT) \
282-@WITH_HEAP_CHECKER_TRUE@ $(am__objects_26)
283-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@am_heap_checker_debug_unittest_OBJECTS = $(am__objects_27)
284+@WITH_HEAP_CHECKER_TRUE@am__objects_25 = $(am__objects_1)
285+@WITH_HEAP_CHECKER_TRUE@am__objects_26 = heap_checker_debug_unittest-heap-checker_unittest.$(OBJEXT) \
286+@WITH_HEAP_CHECKER_TRUE@ $(am__objects_25)
287+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@am_heap_checker_debug_unittest_OBJECTS = $(am__objects_26)
288 heap_checker_debug_unittest_OBJECTS = \
289 $(am_heap_checker_debug_unittest_OBJECTS)
290 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@heap_checker_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
291@@ -966,7 +967,7 @@ am__heap_checker_unittest_SOURCES_DIST = \
292 src/base/logging.h src/base/basictypes.h \
293 src/base/dynamic_annotations.h src/third_party/valgrind.h
294 @WITH_HEAP_CHECKER_TRUE@am_heap_checker_unittest_OBJECTS = heap_checker_unittest-heap-checker_unittest.$(OBJEXT) \
295-@WITH_HEAP_CHECKER_TRUE@ $(am__objects_26)
296+@WITH_HEAP_CHECKER_TRUE@ $(am__objects_25)
297 heap_checker_unittest_OBJECTS = $(am_heap_checker_unittest_OBJECTS)
298 @WITH_HEAP_CHECKER_TRUE@heap_checker_unittest_DEPENDENCIES = \
299 @WITH_HEAP_CHECKER_TRUE@ $(LIBTCMALLOC) liblogging.la \
300@@ -984,9 +985,9 @@ heap_checker_unittest_sh_LDADD = $(LDADD)
301 am__heap_profiler_debug_unittest_SOURCES_DIST = \
302 src/tests/heap-profiler_unittest.cc src/config_for_unittests.h \
303 src/gperftools/heap-profiler.h
304-@WITH_HEAP_PROFILER_TRUE@am__objects_28 = heap_profiler_debug_unittest-heap-profiler_unittest.$(OBJEXT) \
305+@WITH_HEAP_PROFILER_TRUE@am__objects_27 = heap_profiler_debug_unittest-heap-profiler_unittest.$(OBJEXT) \
306 @WITH_HEAP_PROFILER_TRUE@ $(am__objects_1)
307-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@am_heap_profiler_debug_unittest_OBJECTS = $(am__objects_28)
308+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@am_heap_profiler_debug_unittest_OBJECTS = $(am__objects_27)
309 heap_profiler_debug_unittest_OBJECTS = \
310 $(am_heap_profiler_debug_unittest_OBJECTS)
311 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@heap_profiler_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
312@@ -1038,15 +1039,15 @@ am__low_level_alloc_unittest_SOURCES_DIST = \
313 src/base/atomicops-internals-arm-v6plus.h src/base/logging.h \
314 src/base/commandlineflags.h src/base/dynamic_annotations.h \
315 src/third_party/valgrind.h
316-@MINGW_FALSE@am__objects_29 = \
317+@MINGW_FALSE@am__objects_28 = \
318 @MINGW_FALSE@ low_level_alloc_unittest-maybe_threads.$(OBJEXT)
319-am__objects_30 = $(am__objects_1) $(am__objects_1)
320+am__objects_29 = $(am__objects_1) $(am__objects_1)
321 am_low_level_alloc_unittest_OBJECTS = \
322 low_level_alloc_unittest-low_level_alloc.$(OBJEXT) \
323 low_level_alloc_unittest-malloc_hook.$(OBJEXT) \
324- $(am__objects_29) \
325+ $(am__objects_28) \
326 low_level_alloc_unittest-low_level_alloc_unittest.$(OBJEXT) \
327- $(am__objects_30)
328+ $(am__objects_29)
329 low_level_alloc_unittest_OBJECTS = \
330 $(am_low_level_alloc_unittest_OBJECTS)
331 low_level_alloc_unittest_DEPENDENCIES = $(LIBSPINLOCK)
332@@ -1072,10 +1073,10 @@ am__malloc_extension_debug_test_SOURCES_DIST = \
333 src/tests/malloc_extension_test.cc src/config_for_unittests.h \
334 src/base/logging.h src/gperftools/malloc_extension.h \
335 src/gperftools/malloc_extension_c.h
336-am__objects_31 = \
337+am__objects_30 = \
338 malloc_extension_debug_test-malloc_extension_test.$(OBJEXT)
339 @WITH_DEBUGALLOC_TRUE@am_malloc_extension_debug_test_OBJECTS = \
340-@WITH_DEBUGALLOC_TRUE@ $(am__objects_31)
341+@WITH_DEBUGALLOC_TRUE@ $(am__objects_30)
342 malloc_extension_debug_test_OBJECTS = \
343 $(am_malloc_extension_debug_test_OBJECTS)
344 @WITH_DEBUGALLOC_TRUE@malloc_extension_debug_test_DEPENDENCIES = \
345@@ -1124,9 +1125,9 @@ am__memalign_debug_unittest_SOURCES_DIST = \
346 src/tests/memalign_unittest.cc src/tcmalloc.h \
347 src/config_for_unittests.h src/tests/testutil.h \
348 src/tests/testutil.cc
349-@MINGW_FALSE@@OSX_FALSE@am__objects_32 = memalign_debug_unittest-memalign_unittest.$(OBJEXT) \
350+@MINGW_FALSE@@OSX_FALSE@am__objects_31 = memalign_debug_unittest-memalign_unittest.$(OBJEXT) \
351 @MINGW_FALSE@@OSX_FALSE@ memalign_debug_unittest-testutil.$(OBJEXT)
352-@MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@am_memalign_debug_unittest_OBJECTS = $(am__objects_32)
353+@MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@am_memalign_debug_unittest_OBJECTS = $(am__objects_31)
354 memalign_debug_unittest_OBJECTS = \
355 $(am_memalign_debug_unittest_OBJECTS)
356 @MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@memalign_debug_unittest_DEPENDENCIES = libtcmalloc_minimal_debug.la \
357@@ -1197,11 +1198,11 @@ profiledata_unittest_OBJECTS = $(am_profiledata_unittest_OBJECTS)
358 am__profiler1_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
359 src/tests/testutil.h src/tests/testutil.cc \
360 src/config_for_unittests.h src/gperftools/profiler.h
361-@WITH_CPU_PROFILER_TRUE@am__objects_33 = profiler1_unittest-profiler_unittest.$(OBJEXT) \
362+@WITH_CPU_PROFILER_TRUE@am__objects_32 = profiler1_unittest-profiler_unittest.$(OBJEXT) \
363 @WITH_CPU_PROFILER_TRUE@ profiler1_unittest-testutil.$(OBJEXT) \
364 @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
365 @WITH_CPU_PROFILER_TRUE@am_profiler1_unittest_OBJECTS = \
366-@WITH_CPU_PROFILER_TRUE@ $(am__objects_33)
367+@WITH_CPU_PROFILER_TRUE@ $(am__objects_32)
368 profiler1_unittest_OBJECTS = $(am_profiler1_unittest_OBJECTS)
369 @WITH_CPU_PROFILER_TRUE@profiler1_unittest_DEPENDENCIES = \
370 @WITH_CPU_PROFILER_TRUE@ $(LIBPROFILER)
371@@ -1212,11 +1213,11 @@ profiler1_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
372 am__profiler2_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
373 src/tests/testutil.h src/tests/testutil.cc \
374 src/config_for_unittests.h src/gperftools/profiler.h
375-@WITH_CPU_PROFILER_TRUE@am__objects_34 = profiler2_unittest-profiler_unittest.$(OBJEXT) \
376+@WITH_CPU_PROFILER_TRUE@am__objects_33 = profiler2_unittest-profiler_unittest.$(OBJEXT) \
377 @WITH_CPU_PROFILER_TRUE@ profiler2_unittest-testutil.$(OBJEXT) \
378 @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
379 @WITH_CPU_PROFILER_TRUE@am_profiler2_unittest_OBJECTS = \
380-@WITH_CPU_PROFILER_TRUE@ $(am__objects_34)
381+@WITH_CPU_PROFILER_TRUE@ $(am__objects_33)
382 profiler2_unittest_OBJECTS = $(am_profiler2_unittest_OBJECTS)
383 profiler2_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
384 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
385@@ -1225,11 +1226,11 @@ profiler2_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
386 am__profiler3_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
387 src/tests/testutil.h src/tests/testutil.cc \
388 src/config_for_unittests.h src/gperftools/profiler.h
389-@WITH_CPU_PROFILER_TRUE@am__objects_35 = profiler3_unittest-profiler_unittest.$(OBJEXT) \
390+@WITH_CPU_PROFILER_TRUE@am__objects_34 = profiler3_unittest-profiler_unittest.$(OBJEXT) \
391 @WITH_CPU_PROFILER_TRUE@ profiler3_unittest-testutil.$(OBJEXT) \
392 @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
393 @WITH_CPU_PROFILER_TRUE@am_profiler3_unittest_OBJECTS = \
394-@WITH_CPU_PROFILER_TRUE@ $(am__objects_35)
395+@WITH_CPU_PROFILER_TRUE@ $(am__objects_34)
396 profiler3_unittest_OBJECTS = $(am_profiler3_unittest_OBJECTS)
397 @WITH_CPU_PROFILER_TRUE@profiler3_unittest_DEPENDENCIES = \
398 @WITH_CPU_PROFILER_TRUE@ $(LIBPROFILER) $(am__DEPENDENCIES_1)
399@@ -1240,11 +1241,11 @@ profiler3_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
400 am__profiler4_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
401 src/tests/testutil.h src/tests/testutil.cc \
402 src/config_for_unittests.h src/gperftools/profiler.h
403-@WITH_CPU_PROFILER_TRUE@am__objects_36 = profiler4_unittest-profiler_unittest.$(OBJEXT) \
404+@WITH_CPU_PROFILER_TRUE@am__objects_35 = profiler4_unittest-profiler_unittest.$(OBJEXT) \
405 @WITH_CPU_PROFILER_TRUE@ profiler4_unittest-testutil.$(OBJEXT) \
406 @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
407 @WITH_CPU_PROFILER_TRUE@am_profiler4_unittest_OBJECTS = \
408-@WITH_CPU_PROFILER_TRUE@ $(am__objects_36)
409+@WITH_CPU_PROFILER_TRUE@ $(am__objects_35)
410 profiler4_unittest_OBJECTS = $(am_profiler4_unittest_OBJECTS)
411 profiler4_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
412 $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
413@@ -1268,9 +1269,9 @@ raw_printer_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
414 am__realloc_debug_unittest_SOURCES_DIST = \
415 src/tests/realloc_unittest.cc src/config_for_unittests.h \
416 src/base/logging.h
417-am__objects_37 = realloc_debug_unittest-realloc_unittest.$(OBJEXT)
418+am__objects_36 = realloc_debug_unittest-realloc_unittest.$(OBJEXT)
419 @WITH_DEBUGALLOC_TRUE@am_realloc_debug_unittest_OBJECTS = \
420-@WITH_DEBUGALLOC_TRUE@ $(am__objects_37)
421+@WITH_DEBUGALLOC_TRUE@ $(am__objects_36)
422 realloc_debug_unittest_OBJECTS = $(am_realloc_debug_unittest_OBJECTS)
423 @WITH_DEBUGALLOC_TRUE@realloc_debug_unittest_DEPENDENCIES = \
424 @WITH_DEBUGALLOC_TRUE@ libtcmalloc_minimal_debug.la \
425@@ -1290,8 +1291,8 @@ realloc_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
426 $(realloc_unittest_LDFLAGS) $(LDFLAGS) -o $@
427 am__sampler_debug_test_SOURCES_DIST = src/tests/sampler_test.cc \
428 src/config_for_unittests.h
429-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_38 = sampler_debug_test-sampler_test.$(OBJEXT)
430-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampler_debug_test_OBJECTS = $(am__objects_38)
431+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_37 = sampler_debug_test-sampler_test.$(OBJEXT)
432+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampler_debug_test_OBJECTS = $(am__objects_37)
433 sampler_debug_test_OBJECTS = $(am_sampler_debug_test_OBJECTS)
434 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@sampler_debug_test_DEPENDENCIES = libtcmalloc_debug.la \
435 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__DEPENDENCIES_1)
436@@ -1312,9 +1313,9 @@ sampler_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
437 am__sampling_debug_test_SOURCES_DIST = src/tests/sampling_test.cc \
438 src/config_for_unittests.h src/base/logging.h \
439 src/gperftools/malloc_extension.h
440-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_39 = sampling_debug_test-sampling_test.$(OBJEXT) \
441+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_38 = sampling_debug_test-sampling_test.$(OBJEXT) \
442 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
443-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampling_debug_test_OBJECTS = $(am__objects_39)
444+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampling_debug_test_OBJECTS = $(am__objects_38)
445 sampling_debug_test_OBJECTS = $(am_sampling_debug_test_OBJECTS)
446 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@sampling_debug_test_DEPENDENCIES = libtcmalloc_debug.la \
447 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__DEPENDENCIES_1)
448@@ -1347,7 +1348,7 @@ am__simple_compat_test_SOURCES_DIST = src/tests/simple_compat_test.cc \
449 src/google/malloc_extension.h src/google/malloc_extension_c.h \
450 src/google/malloc_hook.h src/google/malloc_hook_c.h \
451 src/google/profiler.h src/google/stacktrace.h \
452- src/google/tcmalloc.h src/windows/google/tcmalloc.h
453+ src/google/tcmalloc.h
454 @WITH_HEAP_PROFILER_TRUE@am_simple_compat_test_OBJECTS = \
455 @WITH_HEAP_PROFILER_TRUE@ simple_compat_test.$(OBJEXT) \
456 @WITH_HEAP_PROFILER_TRUE@ $(am__objects_1)
457@@ -1376,11 +1377,11 @@ am__stacktrace_unittest_SOURCES_DIST = \
458 src/gperftools/stacktrace.h src/base/logging.h \
459 src/base/basictypes.h src/base/dynamic_annotations.h \
460 src/third_party/valgrind.h
461-@WITH_STACK_TRACE_TRUE@am__objects_40 = $(am__objects_4) \
462+@WITH_STACK_TRACE_TRUE@am__objects_39 = $(am__objects_4) \
463 @WITH_STACK_TRACE_TRUE@ $(am__objects_1)
464 @WITH_STACK_TRACE_TRUE@am_stacktrace_unittest_OBJECTS = \
465 @WITH_STACK_TRACE_TRUE@ stacktrace_unittest.$(OBJEXT) \
466-@WITH_STACK_TRACE_TRUE@ $(am__objects_40)
467+@WITH_STACK_TRACE_TRUE@ $(am__objects_39)
468 stacktrace_unittest_OBJECTS = $(am_stacktrace_unittest_OBJECTS)
469 @WITH_STACK_TRACE_TRUE@stacktrace_unittest_DEPENDENCIES = \
470 @WITH_STACK_TRACE_TRUE@ libstacktrace.la liblogging.la
471@@ -1398,10 +1399,10 @@ am__tcmalloc_and_profiler_unittest_SOURCES_DIST = \
472 src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
473 src/tests/testutil.cc src/config_for_unittests.h \
474 src/gperftools/malloc_extension.h
475-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_41 = tcmalloc_and_profiler_unittest-tcmalloc_unittest.$(OBJEXT) \
476+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_40 = tcmalloc_and_profiler_unittest-tcmalloc_unittest.$(OBJEXT) \
477 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_and_profiler_unittest-testutil.$(OBJEXT) \
478 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
479-@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_and_profiler_unittest_OBJECTS = $(am__objects_41)
480+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_and_profiler_unittest_OBJECTS = $(am__objects_40)
481 tcmalloc_and_profiler_unittest_OBJECTS = \
482 $(am_tcmalloc_and_profiler_unittest_OBJECTS)
483 @WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@tcmalloc_and_profiler_unittest_DEPENDENCIES = libtcmalloc_and_profiler.la
484@@ -1413,10 +1414,10 @@ am__tcmalloc_both_unittest_SOURCES_DIST = \
485 src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
486 src/tests/testutil.cc src/config_for_unittests.h \
487 src/gperftools/malloc_extension.h
488-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_42 = tcmalloc_both_unittest-tcmalloc_unittest.$(OBJEXT) \
489+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_41 = tcmalloc_both_unittest-tcmalloc_unittest.$(OBJEXT) \
490 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_both_unittest-testutil.$(OBJEXT) \
491 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
492-@OSX_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_both_unittest_OBJECTS = $(am__objects_42)
493+@OSX_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_both_unittest_OBJECTS = $(am__objects_41)
494 tcmalloc_both_unittest_OBJECTS = $(am_tcmalloc_both_unittest_OBJECTS)
495 @WITH_CPU_PROFILER_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__DEPENDENCIES_4 = $(LIBTCMALLOC) \
496 @WITH_CPU_PROFILER_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(LIBTCMALLOC_MINIMAL) \
497@@ -1436,10 +1437,10 @@ am__tcmalloc_debug_unittest_SOURCES_DIST = \
498 src/tests/tcmalloc_unittest.cc src/tcmalloc.h \
499 src/tests/testutil.h src/tests/testutil.cc \
500 src/config_for_unittests.h src/gperftools/malloc_extension.h
501-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_43 = tcmalloc_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
502+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_42 = tcmalloc_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
503 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_debug_unittest-testutil.$(OBJEXT) \
504 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
505-@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_debug_unittest_OBJECTS = $(am__objects_43)
506+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_debug_unittest_OBJECTS = $(am__objects_42)
507 tcmalloc_debug_unittest_OBJECTS = \
508 $(am_tcmalloc_debug_unittest_OBJECTS)
509 @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@tcmalloc_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
510@@ -1464,12 +1465,12 @@ am__tcmalloc_minimal_debug_unittest_SOURCES_DIST = \
511 src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
512 src/tests/testutil.cc src/config_for_unittests.h \
513 src/gperftools/malloc_extension.h
514-am__objects_44 = \
515+am__objects_43 = \
516 tcmalloc_minimal_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
517 tcmalloc_minimal_debug_unittest-testutil.$(OBJEXT) \
518 $(am__objects_1)
519 @WITH_DEBUGALLOC_TRUE@am_tcmalloc_minimal_debug_unittest_OBJECTS = \
520-@WITH_DEBUGALLOC_TRUE@ $(am__objects_44)
521+@WITH_DEBUGALLOC_TRUE@ $(am__objects_43)
522 tcmalloc_minimal_debug_unittest_OBJECTS = \
523 $(am_tcmalloc_minimal_debug_unittest_OBJECTS)
524 @WITH_DEBUGALLOC_TRUE@tcmalloc_minimal_debug_unittest_DEPENDENCIES = \
525@@ -1937,8 +1938,7 @@ googleinclude_HEADERS = \
526 src/google/malloc_hook_c.h \
527 src/google/profiler.h \
528 src/google/stacktrace.h \
529- src/google/tcmalloc.h \
530- src/windows/google/tcmalloc.h
531+ src/google/tcmalloc.h
532
533 # This is for HTML and other documentation you want to install.
534 # Add your documentation files (in doc/) in addition to these
535@@ -2241,10 +2241,9 @@ S_TCMALLOC_MINIMAL_INCLUDES = src/common.h \
536 SG_TCMALLOC_MINIMAL_INCLUDES = src/gperftools/malloc_hook.h \
537 src/gperftools/malloc_hook_c.h \
538 src/gperftools/malloc_extension.h \
539- src/gperftools/malloc_extension_c.h \
540- src/gperftools/stacktrace.h
541+ src/gperftools/malloc_extension_c.h
542
543-TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
544+TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) $(SG_STACKTRACE_INCLUDES)
545 libtcmalloc_minimal_internal_la_SOURCES = src/common.cc \
546 src/internal_logging.cc \
547 $(SYSTEM_ALLOC_CC) \
548@@ -2464,11 +2463,12 @@ thread_dealloc_unittest_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
549 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/base/thread_lister.h \
550 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/heap-profile-table.h
551
552-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@SG_TCMALLOC_INCLUDES = $(SG_TCMALLOC_MINIMAL_INCLUDES) \
553-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/gperftools/heap-profiler.h \
554+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@SG_TCMALLOC_INCLUDES = src/gperftools/heap-profiler.h \
555 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/gperftools/heap-checker.h
556
557-@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_INCLUDES)
558+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) \
559+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(SG_TCMALLOC_INCLUDES) $(SG_STACKTRACE_INCLUDES)
560+
561 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@libtcmalloc_internal_la_SOURCES = $(libtcmalloc_minimal_internal_la_SOURCES) \
562 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(TCMALLOC_INCLUDES) \
563 @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/base/low_level_alloc.cc \
564@@ -2674,10 +2674,10 @@ thread_dealloc_unittest_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
565 @WITH_CPU_PROFILER_TRUE@ $(SPINLOCK_INCLUDES) \
566 @WITH_CPU_PROFILER_TRUE@ $(LOGGING_INCLUDES)
567
568-@WITH_CPU_PROFILER_TRUE@SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h \
569-@WITH_CPU_PROFILER_TRUE@ src/gperftools/stacktrace.h
570+@WITH_CPU_PROFILER_TRUE@SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h
571+@WITH_CPU_PROFILER_TRUE@CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES) \
572+@WITH_CPU_PROFILER_TRUE@ $(SG_STACKTRACE_INCLUDES)
573
574-@WITH_CPU_PROFILER_TRUE@CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
575 @WITH_CPU_PROFILER_TRUE@libprofiler_la_SOURCES = src/profiler.cc \
576 @WITH_CPU_PROFILER_TRUE@ src/profile-handler.cc \
577 @WITH_CPU_PROFILER_TRUE@ src/profiledata.cc \
578--
5791.8.1.2
580
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.0.bb b/meta-oe/recipes-support/gperftools/gperftools_2.0.bb
new file mode 100644
index 000000000..2522ef846
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.0.bb
@@ -0,0 +1,13 @@
1DESCRIPTION = "Fast, multi-threaded malloc() and nifty performance analysis tools"
2HOMEPAGE = "http://code.google.com/p/gperftools/"
3LICENSE = "BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
5DEPENDS = "libunwind"
6
7SRC_URI = "${DEBIAN_MIRROR}/main/g/google-perftools/google-perftools_${PV}.orig.tar.gz \
8 file://0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch"
9
10SRC_URI[md5sum] = "13f6e8961bc6a26749783137995786b6"
11SRC_URI[sha256sum] = "7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080"
12
13inherit autotools