[tbb] 04/06: Fix build on ARMEL. Targets: #852481

[Steven Capper]

This is an automated email from the git hooks/post-receive script.

capper-guest pushed a commit to branch steve-staging
in repository tbb.

commit 75c61d61209dd0e767db95fd44057c7a23e45c7a
Author: Steve Capper <steven.capper at gmail.com>
Date:   Sun Jul 23 17:03:12 2017 +0100

    Fix build on ARMEL. Targets: #852481
    
    There's some Thumb assembler embedded into tbbmalloc/frontend.cpp.
    We de-activate this for armel as Thumb isn't supported for that case.
---
 debian/patches/fix-armel.patch | 16 ++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/fix-armel.patch b/debian/patches/fix-armel.patch
new file mode 100644
index 0000000..7c551c9
--- /dev/null
+++ b/debian/patches/fix-armel.patch
@@ -0,0 +1,16 @@
+Description: Allow TBB to build on armel systems (__ARM_ARCH == 4)
+Author: Steve Capper <steven.capper at gmail.com>
+
+Index: tbb/src/tbbmalloc/frontend.cpp
+===================================================================
+--- tbb.orig/src/tbbmalloc/frontend.cpp
++++ tbb/src/tbbmalloc/frontend.cpp
+@@ -751,7 +751,7 @@ static inline unsigned int highestBitPos
+ # else
+ #   error highestBitPos() not implemented for this platform
+ # endif
+-#elif __arm__
++#elif __ARM_ARCH_7A__
+     __asm__ __volatile__
+     (
+        "clz %0, %1\n"
diff --git a/debian/patches/series b/debian/patches/series
index 31f15dd..b6718eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ gcc-atomic-always.patch
 tweak-64bits-s390-hppa.patch
 removejsquery.patch
 cross.patch
+fix-armel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git