aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-extra
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-02 10:33:51 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-02 10:33:51 +0200
commit859dbce77dfc8f618688b75f8674bf488a6a4ce9 (patch)
treecebe73d34222047f799ada808030f99351610bba /meta-linaro/recipes-extra
parent4854e2ec06d48db380043e09234b06c19d30eb90 (diff)
downloadmeta-linaro-859dbce77dfc8f618688b75f8674bf488a6a4ce9.tar.gz
removed recipes merged into OE: glog gperftools libmcrypt libunwind tbb
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-extra')
-rw-r--r--meta-linaro/recipes-extra/glog/glog.inc9
-rw-r--r--meta-linaro/recipes-extra/glog/glog_0.3.3.bb6
-rw-r--r--meta-linaro/recipes-extra/google-perftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch580
-rw-r--r--meta-linaro/recipes-extra/google-perftools/gperftools_2.0.bb13
-rw-r--r--meta-linaro/recipes-extra/libmcrypt/libmcrypt_2.5.8.bb12
-rw-r--r--meta-linaro/recipes-extra/libunwind/files/aarch64.patch19
-rw-r--r--meta-linaro/recipes-extra/libunwind/libunwind.inc12
-rw-r--r--meta-linaro/recipes-extra/libunwind/libunwind_1.1.bb8
-rw-r--r--meta-linaro/recipes-extra/tbb/tbb/cross-compile.patch25
-rw-r--r--meta-linaro/recipes-extra/tbb/tbb/tbb.pc11
-rw-r--r--meta-linaro/recipes-extra/tbb/tbb/tbb41-aarch64.patch233
-rw-r--r--meta-linaro/recipes-extra/tbb/tbb_4.1.bb31
12 files changed, 0 insertions, 959 deletions
diff --git a/meta-linaro/recipes-extra/glog/glog.inc b/meta-linaro/recipes-extra/glog/glog.inc
deleted file mode 100644
index 97f37284..00000000
--- a/meta-linaro/recipes-extra/glog/glog.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The glog library implements application-level logging. This \
-library provides logging APIs based on C++-style streams and various helper \
-macros."
-HOMEPAGE = "https://code.google.com/p/google-glog/"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b"
-
-inherit autotools pkgconfig
diff --git a/meta-linaro/recipes-extra/glog/glog_0.3.3.bb b/meta-linaro/recipes-extra/glog/glog_0.3.3.bb
deleted file mode 100644
index de3f0765..00000000
--- a/meta-linaro/recipes-extra/glog/glog_0.3.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require glog.inc
-
-SRC_URI = "http://google-glog.googlecode.com/files/glog-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "a6fd2c22f8996846e34c763422717c18"
-SRC_URI[sha256sum] = "fbf90c2285ba0561db7a40f8a4eefb9aa963e7d399bd450363e959929fe849d0"
diff --git a/meta-linaro/recipes-extra/google-perftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch b/meta-linaro/recipes-extra/google-perftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch
deleted file mode 100644
index cbd4a08f..00000000
--- a/meta-linaro/recipes-extra/google-perftools/gperftools-2.0/0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-Upstream-Status: backport
-
-From baaf0188295582ca68df03f70baa13d96a88e2eb Mon Sep 17 00:00:00 2001
-From: "chappedm@gmail.com" <chappedm@gmail.com>
-Date: Sun, 4 Nov 2012 17:41:47 +0000
-Subject: [PATCH] issue-473: Fix for make install error regarding src/windows/google/tcmalloc.h
-
-git-svn-id: http://gperftools.googlecode.com/svn/trunk@174 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
----
- Makefile.am | 20 +++----
- Makefile.in | 194 ++++++++++++++++++++++++++++++------------------------------
- 2 files changed, 106 insertions(+), 108 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d1cc29d..f932e8d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -126,8 +126,7 @@ googleinclude_HEADERS = \
- src/google/malloc_hook_c.h \
- src/google/profiler.h \
- src/google/stacktrace.h \
-- src/google/tcmalloc.h \
-- src/windows/google/tcmalloc.h
-+ src/google/tcmalloc.h
-
- docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- # This is for HTML and other documentation you want to install.
-@@ -437,9 +436,8 @@ S_TCMALLOC_MINIMAL_INCLUDES = src/common.h \
- SG_TCMALLOC_MINIMAL_INCLUDES = src/gperftools/malloc_hook.h \
- src/gperftools/malloc_hook_c.h \
- src/gperftools/malloc_extension.h \
-- src/gperftools/malloc_extension_c.h \
-- src/gperftools/stacktrace.h
--TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
-+ src/gperftools/malloc_extension_c.h
-+TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) $(SG_STACKTRACE_INCLUDES)
- perftoolsinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
-
- ### Making the library
-@@ -847,10 +845,10 @@ S_TCMALLOC_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) \
- src/base/sysinfo.h \
- src/base/thread_lister.h \
- src/heap-profile-table.h
--SG_TCMALLOC_INCLUDES = $(SG_TCMALLOC_MINIMAL_INCLUDES) \
-- src/gperftools/heap-profiler.h \
-+SG_TCMALLOC_INCLUDES = src/gperftools/heap-profiler.h \
- src/gperftools/heap-checker.h
--TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_INCLUDES)
-+TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) \
-+ $(SG_TCMALLOC_INCLUDES) $(SG_STACKTRACE_INCLUDES)
- perftoolsinclude_HEADERS += $(SG_TCMALLOC_INCLUDES)
-
- ### Making the library
-@@ -1191,9 +1189,9 @@ S_CPU_PROFILER_INCLUDES = src/profiledata.h \
- src/base/sysinfo.h \
- $(SPINLOCK_INCLUDES) \
- $(LOGGING_INCLUDES)
--SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h \
-- src/gperftools/stacktrace.h
--CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
-+SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h
-+CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES) \
-+ $(SG_STACKTRACE_INCLUDES)
- perftoolsinclude_HEADERS += $(SG_CPU_PROFILER_INCLUDES)
-
- ### Making the library
-diff --git a/Makefile.in b/Makefile.in
-index 191754d..9550535 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -349,7 +349,7 @@ am__libprofiler_la_SOURCES_DIST = src/profiler.cc \
- @WITH_CPU_PROFILER_TRUE@am__objects_2 = $(am__objects_1) \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am__objects_3 = $(am__objects_2) \
--@WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
-+@WITH_CPU_PROFILER_TRUE@ $(am__objects_1) $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am_libprofiler_la_OBJECTS = profiler.lo \
- @WITH_CPU_PROFILER_TRUE@ profile-handler.lo profiledata.lo \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_3)
-@@ -439,26 +439,27 @@ am__libtcmalloc_la_SOURCES_DIST = src/tcmalloc.cc src/common.h \
- src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
- src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h \
-- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
-- src/gperftools/heap-checker.h src/base/thread_lister.c \
-+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
-+ src/gperftools/stacktrace.h src/base/thread_lister.c \
- src/base/linuxthreads.cc src/heap-checker.cc \
- src/heap-checker-bcad.cc
- @MINGW_FALSE@am__objects_5 = libtcmalloc_la-tcmalloc.lo
- am__objects_6 = $(am__objects_1)
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_7 = $(am__objects_6) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_8 = $(am__objects_1)
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_9 = $(am__objects_7) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8)
--@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_10 = thread_lister.lo \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_8 = $(am__objects_7) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
-+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_9 = thread_lister.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-linuxthreads.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-heap-checker.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_la-heap-checker-bcad.lo
--@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_11 = $(am__objects_10)
-+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_10 = $(am__objects_9)
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_la_OBJECTS = \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_5) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_11)
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_10)
- libtcmalloc_la_OBJECTS = $(am_libtcmalloc_la_OBJECTS)
- libtcmalloc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -502,29 +503,29 @@ am__libtcmalloc_and_profiler_la_SOURCES_DIST = src/tcmalloc.cc \
- src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
- src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h \
-- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
-- src/gperftools/heap-checker.h src/base/thread_lister.c \
-+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
-+ src/gperftools/stacktrace.h src/base/thread_lister.c \
- src/base/linuxthreads.cc src/heap-checker.cc \
- src/heap-checker-bcad.cc src/profiler.cc \
- src/profile-handler.cc src/profiledata.cc src/profiledata.h \
- src/profile-handler.h src/getpc.h src/base/simple_mutex.h \
- src/gperftools/profiler.h
--@MINGW_FALSE@am__objects_12 = libtcmalloc_and_profiler_la-tcmalloc.lo
--@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_13 = thread_lister.lo \
-+@MINGW_FALSE@am__objects_11 = libtcmalloc_and_profiler_la-tcmalloc.lo
-+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_12 = thread_lister.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-linuxthreads.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-heap-checker.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_and_profiler_la-heap-checker-bcad.lo
--@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_14 = $(am__objects_13)
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_15 = \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_12) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_14)
--@WITH_CPU_PROFILER_TRUE@am__objects_16 = libtcmalloc_and_profiler_la-profiler.lo \
-+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_13 = $(am__objects_12)
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_14 = \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_11) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_13)
-+@WITH_CPU_PROFILER_TRUE@am__objects_15 = libtcmalloc_and_profiler_la-profiler.lo \
- @WITH_CPU_PROFILER_TRUE@ libtcmalloc_and_profiler_la-profile-handler.lo \
- @WITH_CPU_PROFILER_TRUE@ libtcmalloc_and_profiler_la-profiledata.lo \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_3)
--@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_and_profiler_la_OBJECTS = $(am__objects_15) \
--@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_16)
-+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_and_profiler_la_OBJECTS = $(am__objects_14) \
-+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_15)
- libtcmalloc_and_profiler_la_OBJECTS = \
- $(am_libtcmalloc_and_profiler_la_OBJECTS)
- libtcmalloc_and_profiler_la_LINK = $(LIBTOOL) --tag=CXX \
-@@ -568,15 +569,15 @@ am__libtcmalloc_debug_la_SOURCES_DIST = src/debugallocation.cc \
- src/gperftools/malloc_hook.h src/gperftools/malloc_hook_c.h \
- src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h \
-- src/gperftools/stacktrace.h src/gperftools/heap-profiler.h \
-- src/gperftools/heap-checker.h
--@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_17 = thread_lister.lo \
-+ src/gperftools/heap-profiler.h src/gperftools/heap-checker.h \
-+ src/gperftools/stacktrace.h
-+@WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_16 = thread_lister.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-linuxthreads.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-heap-checker.lo \
- @WITH_HEAP_CHECKER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_debug_la-heap-checker-bcad.lo
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_debug_la_OBJECTS = libtcmalloc_debug_la-debugallocation.lo \
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_17) \
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_16) \
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8)
- libtcmalloc_debug_la_OBJECTS = $(am_libtcmalloc_debug_la_OBJECTS)
- libtcmalloc_debug_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -628,12 +629,12 @@ am__libtcmalloc_internal_la_SOURCES_DIST = src/common.cc \
- src/gperftools/heap-checker.h src/base/low_level_alloc.cc \
- src/heap-profile-table.cc src/heap-profiler.cc \
- src/raw_printer.cc src/memory_region_map.cc
--@MINGW_FALSE@am__objects_18 = libtcmalloc_internal_la-system-alloc.lo
--@MINGW_FALSE@am__objects_19 = \
-+@MINGW_FALSE@am__objects_17 = libtcmalloc_internal_la-system-alloc.lo
-+@MINGW_FALSE@am__objects_18 = \
- @MINGW_FALSE@ libtcmalloc_internal_la-maybe_threads.lo
--am__objects_20 = $(am__objects_6) $(am__objects_1)
--am__objects_21 = libtcmalloc_internal_la-common.lo \
-- libtcmalloc_internal_la-internal_logging.lo $(am__objects_18) \
-+am__objects_19 = $(am__objects_6) $(am__objects_1) $(am__objects_1)
-+am__objects_20 = libtcmalloc_internal_la-common.lo \
-+ libtcmalloc_internal_la-internal_logging.lo $(am__objects_17) \
- libtcmalloc_internal_la-memfs_malloc.lo \
- libtcmalloc_internal_la-central_freelist.lo \
- libtcmalloc_internal_la-page_heap.lo \
-@@ -644,11 +645,11 @@ am__objects_21 = libtcmalloc_internal_la-common.lo \
- libtcmalloc_internal_la-symbolize.lo \
- libtcmalloc_internal_la-thread_cache.lo \
- libtcmalloc_internal_la-malloc_hook.lo \
-- libtcmalloc_internal_la-malloc_extension.lo $(am__objects_19) \
-- $(am__objects_20)
-+ libtcmalloc_internal_la-malloc_extension.lo $(am__objects_18) \
-+ $(am__objects_19)
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_libtcmalloc_internal_la_OBJECTS = \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_21) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_9) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_20) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_8) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-low_level_alloc.lo \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-heap-profile-table.lo \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ libtcmalloc_internal_la-heap-profiler.lo \
-@@ -690,9 +691,9 @@ am__libtcmalloc_minimal_la_SOURCES_DIST = src/tcmalloc.cc src/common.h \
- src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h \
- src/gperftools/stacktrace.h
--@MINGW_FALSE@am__objects_22 = libtcmalloc_minimal_la-tcmalloc.lo
--am_libtcmalloc_minimal_la_OBJECTS = $(am__objects_22) \
-- $(am__objects_20)
-+@MINGW_FALSE@am__objects_21 = libtcmalloc_minimal_la-tcmalloc.lo
-+am_libtcmalloc_minimal_la_OBJECTS = $(am__objects_21) \
-+ $(am__objects_19)
- libtcmalloc_minimal_la_OBJECTS = $(am_libtcmalloc_minimal_la_OBJECTS)
- libtcmalloc_minimal_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -730,7 +731,7 @@ am__libtcmalloc_minimal_debug_la_SOURCES_DIST = \
- src/gperftools/malloc_extension_c.h \
- src/gperftools/stacktrace.h
- @WITH_DEBUGALLOC_TRUE@am_libtcmalloc_minimal_debug_la_OBJECTS = libtcmalloc_minimal_debug_la-debugallocation.lo \
--@WITH_DEBUGALLOC_TRUE@ $(am__objects_20)
-+@WITH_DEBUGALLOC_TRUE@ $(am__objects_19)
- libtcmalloc_minimal_debug_la_OBJECTS = \
- $(am_libtcmalloc_minimal_debug_la_OBJECTS)
- libtcmalloc_minimal_debug_la_LINK = $(LIBTOOL) --tag=CXX \
-@@ -773,14 +774,14 @@ am__libtcmalloc_minimal_internal_la_SOURCES_DIST = src/common.cc \
- src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h \
- src/gperftools/stacktrace.h
--@MINGW_FALSE@am__objects_23 = \
-+@MINGW_FALSE@am__objects_22 = \
- @MINGW_FALSE@ libtcmalloc_minimal_internal_la-system-alloc.lo
--@MINGW_FALSE@am__objects_24 = \
-+@MINGW_FALSE@am__objects_23 = \
- @MINGW_FALSE@ libtcmalloc_minimal_internal_la-maybe_threads.lo
- am_libtcmalloc_minimal_internal_la_OBJECTS = \
- libtcmalloc_minimal_internal_la-common.lo \
- libtcmalloc_minimal_internal_la-internal_logging.lo \
-- $(am__objects_23) \
-+ $(am__objects_22) \
- libtcmalloc_minimal_internal_la-memfs_malloc.lo \
- libtcmalloc_minimal_internal_la-central_freelist.lo \
- libtcmalloc_minimal_internal_la-page_heap.lo \
-@@ -792,7 +793,7 @@ am_libtcmalloc_minimal_internal_la_OBJECTS = \
- libtcmalloc_minimal_internal_la-thread_cache.lo \
- libtcmalloc_minimal_internal_la-malloc_hook.lo \
- libtcmalloc_minimal_internal_la-malloc_extension.lo \
-- $(am__objects_24) $(am__objects_20)
-+ $(am__objects_23) $(am__objects_19)
- libtcmalloc_minimal_internal_la_OBJECTS = \
- $(am_libtcmalloc_minimal_internal_la_OBJECTS)
- libtcmalloc_minimal_internal_la_LINK = $(LIBTOOL) --tag=CXX \
-@@ -878,10 +879,10 @@ am__addressmap_unittest_SOURCES_DIST = \
- src/base/basictypes.h src/base/dynamic_annotations.h \
- src/third_party/valgrind.h src/windows/port.h \
- src/windows/port.cc
--@MINGW_TRUE@am__objects_25 = addressmap_unittest-port.$(OBJEXT)
-+@MINGW_TRUE@am__objects_24 = addressmap_unittest-port.$(OBJEXT)
- am_addressmap_unittest_OBJECTS = \
- addressmap_unittest-addressmap_unittest.$(OBJEXT) \
-- $(am__objects_6) $(am__objects_25)
-+ $(am__objects_6) $(am__objects_24)
- addressmap_unittest_OBJECTS = $(am_addressmap_unittest_OBJECTS)
- addressmap_unittest_DEPENDENCIES = liblogging.la
- addressmap_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-@@ -940,10 +941,10 @@ am__heap_checker_debug_unittest_SOURCES_DIST = \
- src/base/googleinit.h src/gperftools/heap-checker.h \
- src/base/logging.h src/base/basictypes.h \
- src/base/dynamic_annotations.h src/third_party/valgrind.h
--@WITH_HEAP_CHECKER_TRUE@am__objects_26 = $(am__objects_1)
--@WITH_HEAP_CHECKER_TRUE@am__objects_27 = heap_checker_debug_unittest-heap-checker_unittest.$(OBJEXT) \
--@WITH_HEAP_CHECKER_TRUE@ $(am__objects_26)
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@am_heap_checker_debug_unittest_OBJECTS = $(am__objects_27)
-+@WITH_HEAP_CHECKER_TRUE@am__objects_25 = $(am__objects_1)
-+@WITH_HEAP_CHECKER_TRUE@am__objects_26 = heap_checker_debug_unittest-heap-checker_unittest.$(OBJEXT) \
-+@WITH_HEAP_CHECKER_TRUE@ $(am__objects_25)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@am_heap_checker_debug_unittest_OBJECTS = $(am__objects_26)
- heap_checker_debug_unittest_OBJECTS = \
- $(am_heap_checker_debug_unittest_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_CHECKER_TRUE@heap_checker_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
-@@ -966,7 +967,7 @@ am__heap_checker_unittest_SOURCES_DIST = \
- src/base/logging.h src/base/basictypes.h \
- src/base/dynamic_annotations.h src/third_party/valgrind.h
- @WITH_HEAP_CHECKER_TRUE@am_heap_checker_unittest_OBJECTS = heap_checker_unittest-heap-checker_unittest.$(OBJEXT) \
--@WITH_HEAP_CHECKER_TRUE@ $(am__objects_26)
-+@WITH_HEAP_CHECKER_TRUE@ $(am__objects_25)
- heap_checker_unittest_OBJECTS = $(am_heap_checker_unittest_OBJECTS)
- @WITH_HEAP_CHECKER_TRUE@heap_checker_unittest_DEPENDENCIES = \
- @WITH_HEAP_CHECKER_TRUE@ $(LIBTCMALLOC) liblogging.la \
-@@ -984,9 +985,9 @@ heap_checker_unittest_sh_LDADD = $(LDADD)
- am__heap_profiler_debug_unittest_SOURCES_DIST = \
- src/tests/heap-profiler_unittest.cc src/config_for_unittests.h \
- src/gperftools/heap-profiler.h
--@WITH_HEAP_PROFILER_TRUE@am__objects_28 = heap_profiler_debug_unittest-heap-profiler_unittest.$(OBJEXT) \
-+@WITH_HEAP_PROFILER_TRUE@am__objects_27 = heap_profiler_debug_unittest-heap-profiler_unittest.$(OBJEXT) \
- @WITH_HEAP_PROFILER_TRUE@ $(am__objects_1)
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@am_heap_profiler_debug_unittest_OBJECTS = $(am__objects_28)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@am_heap_profiler_debug_unittest_OBJECTS = $(am__objects_27)
- heap_profiler_debug_unittest_OBJECTS = \
- $(am_heap_profiler_debug_unittest_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_TRUE@heap_profiler_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
-@@ -1038,15 +1039,15 @@ am__low_level_alloc_unittest_SOURCES_DIST = \
- src/base/atomicops-internals-arm-v6plus.h src/base/logging.h \
- src/base/commandlineflags.h src/base/dynamic_annotations.h \
- src/third_party/valgrind.h
--@MINGW_FALSE@am__objects_29 = \
-+@MINGW_FALSE@am__objects_28 = \
- @MINGW_FALSE@ low_level_alloc_unittest-maybe_threads.$(OBJEXT)
--am__objects_30 = $(am__objects_1) $(am__objects_1)
-+am__objects_29 = $(am__objects_1) $(am__objects_1)
- am_low_level_alloc_unittest_OBJECTS = \
- low_level_alloc_unittest-low_level_alloc.$(OBJEXT) \
- low_level_alloc_unittest-malloc_hook.$(OBJEXT) \
-- $(am__objects_29) \
-+ $(am__objects_28) \
- low_level_alloc_unittest-low_level_alloc_unittest.$(OBJEXT) \
-- $(am__objects_30)
-+ $(am__objects_29)
- low_level_alloc_unittest_OBJECTS = \
- $(am_low_level_alloc_unittest_OBJECTS)
- low_level_alloc_unittest_DEPENDENCIES = $(LIBSPINLOCK)
-@@ -1072,10 +1073,10 @@ am__malloc_extension_debug_test_SOURCES_DIST = \
- src/tests/malloc_extension_test.cc src/config_for_unittests.h \
- src/base/logging.h src/gperftools/malloc_extension.h \
- src/gperftools/malloc_extension_c.h
--am__objects_31 = \
-+am__objects_30 = \
- malloc_extension_debug_test-malloc_extension_test.$(OBJEXT)
- @WITH_DEBUGALLOC_TRUE@am_malloc_extension_debug_test_OBJECTS = \
--@WITH_DEBUGALLOC_TRUE@ $(am__objects_31)
-+@WITH_DEBUGALLOC_TRUE@ $(am__objects_30)
- malloc_extension_debug_test_OBJECTS = \
- $(am_malloc_extension_debug_test_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@malloc_extension_debug_test_DEPENDENCIES = \
-@@ -1124,9 +1125,9 @@ am__memalign_debug_unittest_SOURCES_DIST = \
- src/tests/memalign_unittest.cc src/tcmalloc.h \
- src/config_for_unittests.h src/tests/testutil.h \
- src/tests/testutil.cc
--@MINGW_FALSE@@OSX_FALSE@am__objects_32 = memalign_debug_unittest-memalign_unittest.$(OBJEXT) \
-+@MINGW_FALSE@@OSX_FALSE@am__objects_31 = memalign_debug_unittest-memalign_unittest.$(OBJEXT) \
- @MINGW_FALSE@@OSX_FALSE@ memalign_debug_unittest-testutil.$(OBJEXT)
--@MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@am_memalign_debug_unittest_OBJECTS = $(am__objects_32)
-+@MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@am_memalign_debug_unittest_OBJECTS = $(am__objects_31)
- memalign_debug_unittest_OBJECTS = \
- $(am_memalign_debug_unittest_OBJECTS)
- @MINGW_FALSE@@OSX_FALSE@@WITH_DEBUGALLOC_TRUE@memalign_debug_unittest_DEPENDENCIES = libtcmalloc_minimal_debug.la \
-@@ -1197,11 +1198,11 @@ profiledata_unittest_OBJECTS = $(am_profiledata_unittest_OBJECTS)
- am__profiler1_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
- src/tests/testutil.h src/tests/testutil.cc \
- src/config_for_unittests.h src/gperftools/profiler.h
--@WITH_CPU_PROFILER_TRUE@am__objects_33 = profiler1_unittest-profiler_unittest.$(OBJEXT) \
-+@WITH_CPU_PROFILER_TRUE@am__objects_32 = profiler1_unittest-profiler_unittest.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ profiler1_unittest-testutil.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am_profiler1_unittest_OBJECTS = \
--@WITH_CPU_PROFILER_TRUE@ $(am__objects_33)
-+@WITH_CPU_PROFILER_TRUE@ $(am__objects_32)
- profiler1_unittest_OBJECTS = $(am_profiler1_unittest_OBJECTS)
- @WITH_CPU_PROFILER_TRUE@profiler1_unittest_DEPENDENCIES = \
- @WITH_CPU_PROFILER_TRUE@ $(LIBPROFILER)
-@@ -1212,11 +1213,11 @@ profiler1_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- am__profiler2_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
- src/tests/testutil.h src/tests/testutil.cc \
- src/config_for_unittests.h src/gperftools/profiler.h
--@WITH_CPU_PROFILER_TRUE@am__objects_34 = profiler2_unittest-profiler_unittest.$(OBJEXT) \
-+@WITH_CPU_PROFILER_TRUE@am__objects_33 = profiler2_unittest-profiler_unittest.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ profiler2_unittest-testutil.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am_profiler2_unittest_OBJECTS = \
--@WITH_CPU_PROFILER_TRUE@ $(am__objects_34)
-+@WITH_CPU_PROFILER_TRUE@ $(am__objects_33)
- profiler2_unittest_OBJECTS = $(am_profiler2_unittest_OBJECTS)
- profiler2_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -1225,11 +1226,11 @@ profiler2_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- am__profiler3_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
- src/tests/testutil.h src/tests/testutil.cc \
- src/config_for_unittests.h src/gperftools/profiler.h
--@WITH_CPU_PROFILER_TRUE@am__objects_35 = profiler3_unittest-profiler_unittest.$(OBJEXT) \
-+@WITH_CPU_PROFILER_TRUE@am__objects_34 = profiler3_unittest-profiler_unittest.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ profiler3_unittest-testutil.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am_profiler3_unittest_OBJECTS = \
--@WITH_CPU_PROFILER_TRUE@ $(am__objects_35)
-+@WITH_CPU_PROFILER_TRUE@ $(am__objects_34)
- profiler3_unittest_OBJECTS = $(am_profiler3_unittest_OBJECTS)
- @WITH_CPU_PROFILER_TRUE@profiler3_unittest_DEPENDENCIES = \
- @WITH_CPU_PROFILER_TRUE@ $(LIBPROFILER) $(am__DEPENDENCIES_1)
-@@ -1240,11 +1241,11 @@ profiler3_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- am__profiler4_unittest_SOURCES_DIST = src/tests/profiler_unittest.cc \
- src/tests/testutil.h src/tests/testutil.cc \
- src/config_for_unittests.h src/gperftools/profiler.h
--@WITH_CPU_PROFILER_TRUE@am__objects_36 = profiler4_unittest-profiler_unittest.$(OBJEXT) \
-+@WITH_CPU_PROFILER_TRUE@am__objects_35 = profiler4_unittest-profiler_unittest.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ profiler4_unittest-testutil.$(OBJEXT) \
- @WITH_CPU_PROFILER_TRUE@ $(am__objects_1)
- @WITH_CPU_PROFILER_TRUE@am_profiler4_unittest_OBJECTS = \
--@WITH_CPU_PROFILER_TRUE@ $(am__objects_36)
-+@WITH_CPU_PROFILER_TRUE@ $(am__objects_35)
- profiler4_unittest_OBJECTS = $(am_profiler4_unittest_OBJECTS)
- profiler4_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -1268,9 +1269,9 @@ raw_printer_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- am__realloc_debug_unittest_SOURCES_DIST = \
- src/tests/realloc_unittest.cc src/config_for_unittests.h \
- src/base/logging.h
--am__objects_37 = realloc_debug_unittest-realloc_unittest.$(OBJEXT)
-+am__objects_36 = realloc_debug_unittest-realloc_unittest.$(OBJEXT)
- @WITH_DEBUGALLOC_TRUE@am_realloc_debug_unittest_OBJECTS = \
--@WITH_DEBUGALLOC_TRUE@ $(am__objects_37)
-+@WITH_DEBUGALLOC_TRUE@ $(am__objects_36)
- realloc_debug_unittest_OBJECTS = $(am_realloc_debug_unittest_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@realloc_debug_unittest_DEPENDENCIES = \
- @WITH_DEBUGALLOC_TRUE@ libtcmalloc_minimal_debug.la \
-@@ -1290,8 +1291,8 @@ realloc_unittest_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(realloc_unittest_LDFLAGS) $(LDFLAGS) -o $@
- am__sampler_debug_test_SOURCES_DIST = src/tests/sampler_test.cc \
- src/config_for_unittests.h
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_38 = sampler_debug_test-sampler_test.$(OBJEXT)
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampler_debug_test_OBJECTS = $(am__objects_38)
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_37 = sampler_debug_test-sampler_test.$(OBJEXT)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampler_debug_test_OBJECTS = $(am__objects_37)
- sampler_debug_test_OBJECTS = $(am_sampler_debug_test_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@sampler_debug_test_DEPENDENCIES = libtcmalloc_debug.la \
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__DEPENDENCIES_1)
-@@ -1312,9 +1313,9 @@ sampler_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- am__sampling_debug_test_SOURCES_DIST = src/tests/sampling_test.cc \
- src/config_for_unittests.h src/base/logging.h \
- src/gperftools/malloc_extension.h
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_39 = sampling_debug_test-sampling_test.$(OBJEXT) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_38 = sampling_debug_test-sampling_test.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampling_debug_test_OBJECTS = $(am__objects_39)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_sampling_debug_test_OBJECTS = $(am__objects_38)
- sampling_debug_test_OBJECTS = $(am_sampling_debug_test_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@sampling_debug_test_DEPENDENCIES = libtcmalloc_debug.la \
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__DEPENDENCIES_1)
-@@ -1347,7 +1348,7 @@ am__simple_compat_test_SOURCES_DIST = src/tests/simple_compat_test.cc \
- src/google/malloc_extension.h src/google/malloc_extension_c.h \
- src/google/malloc_hook.h src/google/malloc_hook_c.h \
- src/google/profiler.h src/google/stacktrace.h \
-- src/google/tcmalloc.h src/windows/google/tcmalloc.h
-+ src/google/tcmalloc.h
- @WITH_HEAP_PROFILER_TRUE@am_simple_compat_test_OBJECTS = \
- @WITH_HEAP_PROFILER_TRUE@ simple_compat_test.$(OBJEXT) \
- @WITH_HEAP_PROFILER_TRUE@ $(am__objects_1)
-@@ -1376,11 +1377,11 @@ am__stacktrace_unittest_SOURCES_DIST = \
- src/gperftools/stacktrace.h src/base/logging.h \
- src/base/basictypes.h src/base/dynamic_annotations.h \
- src/third_party/valgrind.h
--@WITH_STACK_TRACE_TRUE@am__objects_40 = $(am__objects_4) \
-+@WITH_STACK_TRACE_TRUE@am__objects_39 = $(am__objects_4) \
- @WITH_STACK_TRACE_TRUE@ $(am__objects_1)
- @WITH_STACK_TRACE_TRUE@am_stacktrace_unittest_OBJECTS = \
- @WITH_STACK_TRACE_TRUE@ stacktrace_unittest.$(OBJEXT) \
--@WITH_STACK_TRACE_TRUE@ $(am__objects_40)
-+@WITH_STACK_TRACE_TRUE@ $(am__objects_39)
- stacktrace_unittest_OBJECTS = $(am_stacktrace_unittest_OBJECTS)
- @WITH_STACK_TRACE_TRUE@stacktrace_unittest_DEPENDENCIES = \
- @WITH_STACK_TRACE_TRUE@ libstacktrace.la liblogging.la
-@@ -1398,10 +1399,10 @@ am__tcmalloc_and_profiler_unittest_SOURCES_DIST = \
- src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
- src/tests/testutil.cc src/config_for_unittests.h \
- src/gperftools/malloc_extension.h
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_41 = tcmalloc_and_profiler_unittest-tcmalloc_unittest.$(OBJEXT) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_40 = tcmalloc_and_profiler_unittest-tcmalloc_unittest.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_and_profiler_unittest-testutil.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
--@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_and_profiler_unittest_OBJECTS = $(am__objects_41)
-+@WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_and_profiler_unittest_OBJECTS = $(am__objects_40)
- tcmalloc_and_profiler_unittest_OBJECTS = \
- $(am_tcmalloc_and_profiler_unittest_OBJECTS)
- @WITH_CPU_PROFILER_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@tcmalloc_and_profiler_unittest_DEPENDENCIES = libtcmalloc_and_profiler.la
-@@ -1413,10 +1414,10 @@ am__tcmalloc_both_unittest_SOURCES_DIST = \
- src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
- src/tests/testutil.cc src/config_for_unittests.h \
- src/gperftools/malloc_extension.h
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_42 = tcmalloc_both_unittest-tcmalloc_unittest.$(OBJEXT) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_41 = tcmalloc_both_unittest-tcmalloc_unittest.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_both_unittest-testutil.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
--@OSX_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_both_unittest_OBJECTS = $(am__objects_42)
-+@OSX_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_both_unittest_OBJECTS = $(am__objects_41)
- tcmalloc_both_unittest_OBJECTS = $(am_tcmalloc_both_unittest_OBJECTS)
- @WITH_CPU_PROFILER_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__DEPENDENCIES_4 = $(LIBTCMALLOC) \
- @WITH_CPU_PROFILER_FALSE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(LIBTCMALLOC_MINIMAL) \
-@@ -1436,10 +1437,10 @@ am__tcmalloc_debug_unittest_SOURCES_DIST = \
- src/tests/tcmalloc_unittest.cc src/tcmalloc.h \
- src/tests/testutil.h src/tests/testutil.cc \
- src/config_for_unittests.h src/gperftools/malloc_extension.h
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_43 = tcmalloc_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am__objects_42 = tcmalloc_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ tcmalloc_debug_unittest-testutil.$(OBJEXT) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(am__objects_1)
--@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_debug_unittest_OBJECTS = $(am__objects_43)
-+@WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@am_tcmalloc_debug_unittest_OBJECTS = $(am__objects_42)
- tcmalloc_debug_unittest_OBJECTS = \
- $(am_tcmalloc_debug_unittest_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@tcmalloc_debug_unittest_DEPENDENCIES = libtcmalloc_debug.la \
-@@ -1464,12 +1465,12 @@ am__tcmalloc_minimal_debug_unittest_SOURCES_DIST = \
- src/tests/tcmalloc_unittest.cc src/tests/testutil.h \
- src/tests/testutil.cc src/config_for_unittests.h \
- src/gperftools/malloc_extension.h
--am__objects_44 = \
-+am__objects_43 = \
- tcmalloc_minimal_debug_unittest-tcmalloc_unittest.$(OBJEXT) \
- tcmalloc_minimal_debug_unittest-testutil.$(OBJEXT) \
- $(am__objects_1)
- @WITH_DEBUGALLOC_TRUE@am_tcmalloc_minimal_debug_unittest_OBJECTS = \
--@WITH_DEBUGALLOC_TRUE@ $(am__objects_44)
-+@WITH_DEBUGALLOC_TRUE@ $(am__objects_43)
- tcmalloc_minimal_debug_unittest_OBJECTS = \
- $(am_tcmalloc_minimal_debug_unittest_OBJECTS)
- @WITH_DEBUGALLOC_TRUE@tcmalloc_minimal_debug_unittest_DEPENDENCIES = \
-@@ -1937,8 +1938,7 @@ googleinclude_HEADERS = \
- src/google/malloc_hook_c.h \
- src/google/profiler.h \
- src/google/stacktrace.h \
-- src/google/tcmalloc.h \
-- src/windows/google/tcmalloc.h
-+ src/google/tcmalloc.h
-
- # This is for HTML and other documentation you want to install.
- # Add your documentation files (in doc/) in addition to these
-@@ -2241,10 +2241,9 @@ S_TCMALLOC_MINIMAL_INCLUDES = src/common.h \
- SG_TCMALLOC_MINIMAL_INCLUDES = src/gperftools/malloc_hook.h \
- src/gperftools/malloc_hook_c.h \
- src/gperftools/malloc_extension.h \
-- src/gperftools/malloc_extension_c.h \
-- src/gperftools/stacktrace.h
-+ src/gperftools/malloc_extension_c.h
-
--TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
-+TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) $(SG_STACKTRACE_INCLUDES)
- libtcmalloc_minimal_internal_la_SOURCES = src/common.cc \
- src/internal_logging.cc \
- $(SYSTEM_ALLOC_CC) \
-@@ -2464,11 +2463,12 @@ thread_dealloc_unittest_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/base/thread_lister.h \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/heap-profile-table.h
-
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@SG_TCMALLOC_INCLUDES = $(SG_TCMALLOC_MINIMAL_INCLUDES) \
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/gperftools/heap-profiler.h \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@SG_TCMALLOC_INCLUDES = src/gperftools/heap-profiler.h \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/gperftools/heap-checker.h
-
--@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_INCLUDES)
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES) \
-+@WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(SG_TCMALLOC_INCLUDES) $(SG_STACKTRACE_INCLUDES)
-+
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@libtcmalloc_internal_la_SOURCES = $(libtcmalloc_minimal_internal_la_SOURCES) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ $(TCMALLOC_INCLUDES) \
- @WITH_HEAP_PROFILER_OR_CHECKER_TRUE@ src/base/low_level_alloc.cc \
-@@ -2674,10 +2674,10 @@ thread_dealloc_unittest_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
- @WITH_CPU_PROFILER_TRUE@ $(SPINLOCK_INCLUDES) \
- @WITH_CPU_PROFILER_TRUE@ $(LOGGING_INCLUDES)
-
--@WITH_CPU_PROFILER_TRUE@SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h \
--@WITH_CPU_PROFILER_TRUE@ src/gperftools/stacktrace.h
-+@WITH_CPU_PROFILER_TRUE@SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h
-+@WITH_CPU_PROFILER_TRUE@CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES) \
-+@WITH_CPU_PROFILER_TRUE@ $(SG_STACKTRACE_INCLUDES)
-
--@WITH_CPU_PROFILER_TRUE@CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
- @WITH_CPU_PROFILER_TRUE@libprofiler_la_SOURCES = src/profiler.cc \
- @WITH_CPU_PROFILER_TRUE@ src/profile-handler.cc \
- @WITH_CPU_PROFILER_TRUE@ src/profiledata.cc \
---
-1.8.1.2
-
diff --git a/meta-linaro/recipes-extra/google-perftools/gperftools_2.0.bb b/meta-linaro/recipes-extra/google-perftools/gperftools_2.0.bb
deleted file mode 100644
index 2522ef84..00000000
--- a/meta-linaro/recipes-extra/google-perftools/gperftools_2.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE = "http://code.google.com/p/gperftools/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
-DEPENDS = "libunwind"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/g/google-perftools/google-perftools_${PV}.orig.tar.gz \
- file://0001-issue-473-Fix-for-make-install-error-regarding-src-w.patch"
-
-SRC_URI[md5sum] = "13f6e8961bc6a26749783137995786b6"
-SRC_URI[sha256sum] = "7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080"
-
-inherit autotools
diff --git a/meta-linaro/recipes-extra/libmcrypt/libmcrypt_2.5.8.bb b/meta-linaro/recipes-extra/libmcrypt/libmcrypt_2.5.8.bb
deleted file mode 100644
index a1693903..00000000
--- a/meta-linaro/recipes-extra/libmcrypt/libmcrypt_2.5.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Replacement for the old crypt() package and crypt(1) command, with extensions."
-HOMEPAGE = "http://mcrypt.sourceforge.net/"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
-DEPENDS = "libtool"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/mcrypt/Libmcrypt/${PV}/libmcrypt-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "0821830d930a86a5c69110837c55b7da"
-SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e"
-
-inherit autotools gettext binconfig
diff --git a/meta-linaro/recipes-extra/libunwind/files/aarch64.patch b/meta-linaro/recipes-extra/libunwind/files/aarch64.patch
deleted file mode 100644
index 9ea8d832..00000000
--- a/meta-linaro/recipes-extra/libunwind/files/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- libunwind-1.1.orig/configure.ac
-+++ libunwind-1.1/configure.ac
-@@ -135,11 +135,11 @@ AM_CONDITIONAL(OS_HPUX, expr x$target_os
- AM_CONDITIONAL(OS_FREEBSD, expr x$target_os : xfreebsd >/dev/null)
-
- AC_MSG_CHECKING([for ELF helper width])
- case "${target_arch}" in
- (arm|hppa|ppc32|x86|sh) use_elf32=yes; AC_MSG_RESULT([32]);;
--(ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);;
-+(ia64|ppc64|x86_64|aarch64) use_elf64=yes; AC_MSG_RESULT([64]);;
- (mips) use_elfxx=yes; AC_MSG_RESULT([xx]);;
- *) AC_MSG_ERROR([Unknown ELF target: ${target_arch}])
- esac
- AM_CONDITIONAL(USE_ELF32, [test x$use_elf32 = xyes])
- AM_CONDITIONAL(USE_ELF64, [test x$use_elf64 = xyes])
diff --git a/meta-linaro/recipes-extra/libunwind/libunwind.inc b/meta-linaro/recipes-extra/libunwind/libunwind.inc
deleted file mode 100644
index f028766b..00000000
--- a/meta-linaro/recipes-extra/libunwind/libunwind.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program"
-HOMEPAGE = "http://www.nongnu.org/libunwind"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5"
-
-SRC_URI = "http://download.savannah.nongnu.org/releases/${BPN}/${BPN}-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF_arm = "--enable-debug-frame"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-linaro/recipes-extra/libunwind/libunwind_1.1.bb b/meta-linaro/recipes-extra/libunwind/libunwind_1.1.bb
deleted file mode 100644
index 2cca1f89..00000000
--- a/meta-linaro/recipes-extra/libunwind/libunwind_1.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libunwind.inc
-
-PR = "r1"
-
-SRC_URI += "file://aarch64.patch"
-
-SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce"
-SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a"
diff --git a/meta-linaro/recipes-extra/tbb/tbb/cross-compile.patch b/meta-linaro/recipes-extra/tbb/tbb/cross-compile.patch
deleted file mode 100644
index b970a374..00000000
--- a/meta-linaro/recipes-extra/tbb/tbb/cross-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-Upstream-Status: unsuitable
----
- build/linux.gcc.inc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- tbb41_20121003oss.orig/build/linux.gcc.inc
-+++ tbb41_20121003oss/build/linux.gcc.inc
-@@ -40,12 +40,13 @@ DYLIB_KEY = -shared
- EXPORT_KEY = -Wl,--version-script,
- LIBDL = -ldl
-
- TBB_NOSTRICT = 1
-
--CPLUS = g++
--CONLY = gcc
-+CPLUS = $(CXX)
-+CONLY = $(CC)
-+CPLUS_FLAGS = $(CXXFLAGS)
- LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
- LIBS += -lpthread -lrt
- LINK_FLAGS = -Wl,-rpath-link=.
- C_FLAGS = $(CPLUS_FLAGS)
- # gcc 4.4 and higher support -std=c++0x
diff --git a/meta-linaro/recipes-extra/tbb/tbb/tbb.pc b/meta-linaro/recipes-extra/tbb/tbb/tbb.pc
deleted file mode 100644
index 644b64fb..00000000
--- a/meta-linaro/recipes-extra/tbb/tbb/tbb.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Threading Building Blocks
-Description: Intel's parallelism library for C++
-URL: http://www.threadingbuildingblocks.org/
-Version: 3.0+r018
-Libs: -L${libdir} -ltbb
-Cflags: -I${includedir}
diff --git a/meta-linaro/recipes-extra/tbb/tbb/tbb41-aarch64.patch b/meta-linaro/recipes-extra/tbb/tbb/tbb41-aarch64.patch
deleted file mode 100644
index 3366f874..00000000
--- a/meta-linaro/recipes-extra/tbb/tbb/tbb41-aarch64.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-Author: Leif Lindholm <leif.lindholm@linaro.org>
-
-Upstream-Status: not there yet
-
-https://bugs.launchpad.net/linaro-aarch64/+bug/1091353
-
-diff --git a/build/linux.inc b/build/linux.inc
-index bdad142..7db323c 100644
---- a/build/linux.inc
-+++ b/build/linux.inc
-@@ -104,6 +104,9 @@ endif
- ifeq ($(arch),sparc)
- def_prefix = lin64
- endif
-+ifeq ($(arch),aarch64)
-+ def_prefix = lin64
-+endif
- ifeq (,$(def_prefix))
- ifeq (64,$(findstring 64,$(arch)))
- def_prefix = lin64
-diff --git a/include/tbb/machine/linux_aarch64.h b/include/tbb/machine/linux_aarch64.h
-new file mode 100644
-index 0000000..e3ebc36
---- /dev/null
-+++ b/include/tbb/machine/linux_aarch64.h
-@@ -0,0 +1,153 @@
-+/*
-+ Copyright 2013 Linaro All Rights Reserved.
-+
-+ This file is part of Threading Building Blocks.
-+
-+ Threading Building Blocks is free software; you can redistribute it
-+ and/or modify it under the terms of the GNU General Public License
-+ version 2 as published by the Free Software Foundation.
-+
-+ Threading Building Blocks is distributed in the hope that it will be
-+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with Threading Building Blocks; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+ As a special exception, you may use this file as part of a free software
-+ library without restriction. Specifically, if other files instantiate
-+ templates or use macros or inline functions from this file, or you compile
-+ this file and link it with other files to produce an executable, this
-+ file does not by itself cause the resulting executable to be covered by
-+ the GNU General Public License. This exception does not however
-+ invalidate any other reasons why the executable file might be covered by
-+ the GNU General Public License.
-+*/
-+
-+/*
-+ This is the TBB implementation for the ARM AArch64 architecture.
-+*/
-+
-+#ifndef __TBB_machine_H
-+#error Do not include this file directly; include tbb_machine.h instead
-+#endif
-+
-+#if !(__aarch64__)
-+#error Threading Building Blocks AArch64 port requires an AArch64 architecture.
-+#endif
-+
-+#include <sys/param.h>
-+#include <unistd.h>
-+
-+#define __TBB_WORDSIZE 8
-+
-+#ifndef __BYTE_ORDER__
-+ // Hopefully endianness can be validly determined at runtime.
-+ // This may silently fail in some embedded systems with page-specific endianness.
-+#elif __BYTE_ORDER__==__ORDER_BIG_ENDIAN__
-+ #define __TBB_BIG_ENDIAN 1
-+#elif __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
-+ #define __TBB_BIG_ENDIAN 0
-+#else
-+ #define __TBB_BIG_ENDIAN -1 // not currently supported
-+#endif
-+
-+
-+#define __TBB_compiler_fence() __asm__ __volatile__("": : :"memory")
-+#define __TBB_control_consistency_helper() __TBB_compiler_fence()
-+
-+#define __TBB_aarch64_inner_shareable_barrier() __asm__ __volatile__("dmb ish": : :"memory")
-+#define __TBB_acquire_consistency_helper() __TBB_aarch64_inner_shareable_barrier()
-+#define __TBB_release_consistency_helper() __TBB_aarch64_inner_shareable_barrier()
-+#define __TBB_full_memory_fence() __TBB_aarch64_inner_shareable_barrier()
-+
-+//--------------------------------------------------
-+// Compare and swap
-+//--------------------------------------------------
-+
-+/**
-+ * Atomic CAS for 32 bit values, if *ptr==comparand, then *ptr=value,
-+ * returns *ptr
-+ *
-+ * @param ptr pointer to value in memory to be swapped with value
-+ * if *ptr==comparand
-+ * @param value value to assign *ptr to if *ptr==comparand
-+ * @param comparand value to compare with *ptr
-+ * @return value originally in memory at ptr, regardless of success
-+*/
-+static inline int32_t __TBB_machine_cmpswp4(volatile void *ptr, int32_t value, int32_t comparand )
-+{
-+ int32_t oldval, res;
-+
-+ do {
-+ __asm__ __volatile__(
-+ " ldxr %w1, [%2]\n"
-+ " mov %w0, #0\n"
-+ " cmp %w1, %w3\n"
-+ " b.ne 1f\n"
-+ " stxr %w0, %w4, [%2]\n"
-+ "1:\n"
-+ : "=&r" (res), "=&r" (oldval)
-+ : "r" (ptr), "Ir" (value), "r" (comparand)
-+ : "cc");
-+ } while (res);
-+
-+ return oldval;
-+}
-+
-+/**
-+ * Atomic CAS for 64 bit values, if *ptr==comparand, then *ptr=value,
-+ * returns *ptr
-+ *
-+ * @param ptr pointer to value in memory to be swapped with value
-+ * if *ptr==comparand
-+ * @param value value to assign *ptr to if *ptr==comparand
-+ * @param comparand value to compare with *ptr
-+ * @return value originally in memory at ptr, regardless of success
-+ */
-+static inline int64_t __TBB_machine_cmpswp8(volatile void *ptr, int64_t value, int64_t comparand )
-+{
-+ int64_t oldval;
-+ int64_t res;
-+
-+ do {
-+ __asm__ __volatile__(
-+ " ldxr %1, [%2]\n"
-+ " mov %w0, #0\n"
-+ " cmp %1, %3\n"
-+ " b.ne 1f\n"
-+ " stxr %w0, %4, [%2]\n"
-+ "1:\n"
-+ : "=&r" (res), "=&r" (oldval)
-+ : "r" (ptr), "Ir" (value), "r" (comparand)
-+ : "cc");
-+ } while (res);
-+
-+ return oldval;
-+}
-+
-+inline void __TBB_machine_pause (int32_t delay )
-+{
-+ while(delay>0)
-+ {
-+ __TBB_compiler_fence();
-+ delay--;
-+ }
-+}
-+
-+// Machine specific atomic operations
-+
-+#define __TBB_CompareAndSwap4(P,V,C) __TBB_machine_cmpswp4(P,V,C)
-+#define __TBB_CompareAndSwap8(P,V,C) __TBB_machine_cmpswp8(P,V,C)
-+//#define __TBB_CompareAndSwapW(P,V,C) __TBB_machine_cmpswp4(P,V,C)
-+#define __TBB_Pause(V) __TBB_machine_pause(V)
-+
-+// Use generics for some things
-+#define __TBB_USE_GENERIC_PART_WORD_CAS 1
-+#define __TBB_USE_GENERIC_FETCH_ADD 1
-+#define __TBB_USE_GENERIC_FETCH_STORE 1
-+#define __TBB_USE_GENERIC_HALF_FENCED_LOAD_STORE 1
-+#define __TBB_USE_GENERIC_RELAXED_LOAD_STORE 1
-+#define __TBB_USE_GENERIC_SEQUENTIAL_CONSISTENCY_LOAD_STORE 1
-diff --git a/include/tbb/tbb_machine.h b/include/tbb/tbb_machine.h
-index 752062e..5342877 100644
---- a/include/tbb/tbb_machine.h
-+++ b/include/tbb/tbb_machine.h
-@@ -223,6 +223,8 @@ template<> struct atomic_selector<8> {
- #include "machine/linux_ia64.h"
- #elif __powerpc__
- #include "machine/mac_ppc.h"
-+ #elif __aarch64__
-+ #include "machine/linux_aarch64.h"
- #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT
- #include "machine/gcc_generic.h"
- #endif
-@@ -391,10 +393,12 @@ void spin_wait_until_eq( const volatile T& location, const U value ) {
- // - The operation assumes that the architecture consistently uses either little-endian or big-endian:
- // it does not support mixed-endian or page-specific bi-endian architectures.
- // This function is the only use of __TBB_BIG_ENDIAN.
--#if (__TBB_BIG_ENDIAN!=-1)
-+#if (__TBB_BIG_ENDIAN==-1)
- #if ( __TBB_USE_GENERIC_PART_WORD_CAS)
- #error generic implementation of part-word CAS was explicitly disabled for this configuration
- #endif
-+#endif
-+
- template<typename T>
- inline T __TBB_MaskedCompareAndSwap (volatile T * const ptr, const T value, const T comparand ) {
- struct endianness{ static bool is_big_endian(){
-@@ -432,7 +436,6 @@ inline T __TBB_MaskedCompareAndSwap (volatile T * const ptr, const T value, cons
- else continue; // CAS failed but the bits of interest left unchanged
- }
- }
--#endif
- template<size_t S, typename T>
- inline T __TBB_CompareAndSwapGeneric (volatile void *ptr, T value, T comparand );
-
-diff --git a/src/tbbmalloc/frontend.cpp b/src/tbbmalloc/frontend.cpp
-index 4e81870..ddac9e0 100644
---- a/src/tbbmalloc/frontend.cpp
-+++ b/src/tbbmalloc/frontend.cpp
-@@ -653,6 +653,14 @@ static inline unsigned int highestBitPos(unsigned int n)
- # error highestBitPos() not implemented for this platform
- # endif
-
-+#elif __aarch64__
-+ __asm__ __volatile__
-+ (
-+ "clz %0, %1\n"
-+ "mov %1, %2\n"
-+ "sub %0, %1, %0\n"
-+ :"=&r" (pos), "=&r" (n) :"I" (31)
-+ );
- #else
- static unsigned int bsr[16] = {0/*N/A*/,6,7,7,8,8,8,8,9,9,9,9,9,9,9,9};
- pos = bsr[ n>>6 ];
diff --git a/meta-linaro/recipes-extra/tbb/tbb_4.1.bb b/meta-linaro/recipes-extra/tbb/tbb_4.1.bb
deleted file mode 100644
index 2337bdda..00000000
--- a/meta-linaro/recipes-extra/tbb/tbb_4.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Parallelism library for C++ - runtime files \
- TBB is a library that helps you leverage multi-core processor \
- performance without having to be a threading expert. It represents a \
- higher-level, task-based parallelism that abstracts platform details \
- and threading mechanism for performance and scalability."
-HOMEPAGE = "http://threadingbuildingblocks.org/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1"
-PRDATE = "20130116"
-PR = "r${PRDATE}"
-
-SRC_URI = "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_${PRDATE}oss_src.tgz \
- file://cross-compile.patch \
- file://tbb.pc"
-
-S = "${WORKDIR}/tbb41_${PRDATE}oss/"
-
-SRC_URI[md5sum] = "3809790e1001a1b32d59c9fee590ee85"
-SRC_URI[sha256sum] = "4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6"
-
-do_compile() {
- oe_runmake compiler=gcc arch=${HOST_ARCH} runtime=cc4
-}
-
-do_install() {
- install -d ${D}${includedir} ${D}${libdir}/pkgconfig
- rm ${S}/include/tbb/index.html -f
- cp -a ${S}/include/tbb ${D}${includedir}
- install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir}
- install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig
-}