aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/tbb/tbb
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-15 18:00:47 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-19 02:45:27 +0200
commit3c2891137dc35872264164eba58599e74ac3f57c (patch)
tree67ed677a98666851a2114fc45b3bc28b2b7d653f /meta-oe/recipes-support/tbb/tbb
parentb3beff1f2457f4d591c6a94ee8441d9dba27feb2 (diff)
downloadmeta-openembedded-contrib-3c2891137dc35872264164eba58599e74ac3f57c.tar.gz
tbb: update to 4.1 Update 3 version from 20130314
ARMv7a support was added in 4.1 Update 3 Older ARM cores support was added by me. Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/tbb/tbb')
-rw-r--r--meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
new file mode 100644
index 0000000000..cd2ec9499c
--- /dev/null
+++ b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch
@@ -0,0 +1,30 @@
+From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+Description: Allow to build TBB for ARM cores older than ARMv7a
+
+| ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading
+Building Blocks ARM port requires an ARMv7-a architecture.
+| make[1]: *** [concurrent_hash_map.o] Error 1
+
+https://bugs.launchpad.net/linaro-oe/+bug/1167144
+
+Upstream-status: pending
+
+---
+ include/tbb/tbb_machine.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- tbb41_20130314oss.orig/include/tbb/tbb_machine.h
++++ tbb41_20130314oss/include/tbb/tbb_machine.h
+@@ -237,11 +237,11 @@ template<> struct atomic_selector<8> {
+ #include "machine/linux_intel64.h"
+ #elif __ia64__
+ #include "machine/linux_ia64.h"
+ #elif __powerpc__
+ #include "machine/mac_ppc.h"
+- #elif __arm__
++ #elif __ARM_ARCH_7A__
+ #include "machine/gcc_armv7.h"
+ #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT
+ #include "machine/gcc_generic.h"
+ #endif
+ #include "machine/linux_common.h"