| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> |
| 2 | Description: Allow to build TBB for ARM cores older than ARMv7a |
| 3 | |
| 4 | | ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading |
| 5 | Building Blocks ARM port requires an ARMv7-a architecture. |
| 6 | | make[1]: *** [concurrent_hash_map.o] Error 1 |
| 7 | |
| 8 | https://bugs.launchpad.net/linaro-oe/+bug/1167144 |
| 9 | |
| 10 | Upstream-status: pending |
| 11 | |
| 12 | --- |
| 13 | include/tbb/tbb_machine.h | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | --- tbb41_20130314oss.orig/include/tbb/tbb_machine.h |
| 17 | +++ tbb41_20130314oss/include/tbb/tbb_machine.h |
| 18 | @@ -237,11 +237,11 @@ template<> struct atomic_selector<8> { |
| 19 | #include "machine/linux_intel64.h" |
| 20 | #elif __ia64__ |
| 21 | #include "machine/linux_ia64.h" |
| 22 | #elif __powerpc__ |
| 23 | #include "machine/mac_ppc.h" |
| 24 | - #elif __arm__ |
| 25 | + #elif __ARM_ARCH_7A__ |
| 26 | #include "machine/gcc_armv7.h" |
| 27 | #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT |
| 28 | #include "machine/gcc_generic.h" |
| 29 | #endif |
| 30 | #include "machine/linux_common.h" |