[tbb] 01/01: Advertise exception_ptr, remove unaligned access from unit test.

[Steven Capper]

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

capper-guest pushed a commit to annotated tag debian/2017_U7-8
in repository tbb.

commit 358c2d14800dcf7710ff38111af18aa46cc15bb0
Author: Steve Capper <steven.capper at gmail.com>
Date:   Wed Oct 4 15:31:04 2017 +0100

    Advertise exception_ptr, remove unaligned access from unit test.
    
    Bump version to 2017~U7-8
---
 debian/changelog                         | 10 ++++++++++
 debian/patches/armel-exception-ptr.patch | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd53b87..d058c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tbb (2017~U7-8) unstable; urgency=medium
+
+  * Remove un-aligned memory access unit test from test_malloc_pools.exe
+    - This allows sparc64 to pass unit tests. Closes: #832104
+
+  [ Adrian Bunk ]
+  * Advertise exception_ptr with gcc >= 7, Closes: #877380
+
+ -- Steve Capper <steven.capper at gmail.com>  Wed, 04 Oct 2017 14:46:23 +0100
+
 tbb (2017~U7-7~exp1) experimental; urgency=medium
 
   * Remove un-aligned memory access unit test from test_malloc_pools.exe
diff --git a/debian/patches/armel-exception-ptr.patch b/debian/patches/armel-exception-ptr.patch
new file mode 100644
index 0000000..5d1d096
--- /dev/null
+++ b/debian/patches/armel-exception-ptr.patch
@@ -0,0 +1,18 @@
+Description: __TBB_EXCEPTION_PTR_PRESENT fix for armel
+ exception_ptr in GCC >= 7 no longer requires atomic instructions.
+Author: Adrian Bunk <bunk at debian.org>
+
+--- tbb-2017~U7.orig/include/tbb/tbb_config.h
++++ tbb-2017~U7/include/tbb/tbb_config.h
+@@ -226,8 +226,9 @@
+     #define __TBB_IMPLICIT_MOVE_PRESENT                     (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40600)
+     /** __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 here is a substitution for _GLIBCXX_ATOMIC_BUILTINS_4, which is a prerequisite
+         for exception_ptr but cannot be used in this file because it is defined in a header, not by the compiler.
+-        If the compiler has no atomic intrinsics, the C++ library should not expect those as well. **/
+-    #define __TBB_EXCEPTION_PTR_PRESENT                     (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40404 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
++        GCC >= 7 has exception_ptr even without atomic instructions:
++        https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735#c11 **/
++    #define __TBB_EXCEPTION_PTR_PRESENT                     (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40404 && (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 || (__TBB_GCC_VERSION >= 70000)))
+     #define __TBB_STATIC_ASSERT_PRESENT                     (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40300)
+     #define __TBB_CPP11_TUPLE_PRESENT                       (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40300)
+     #define __TBB_INITIALIZER_LISTS_PRESENT                 (__GXX_EXPERIMENTAL_CXX0X__ && __TBB_GCC_VERSION >= 40400)
diff --git a/debian/patches/series b/debian/patches/series
index f7a5c07..6896b88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ allow-reproducible-builds.patch
 fixup-mips-harness.patch
 enhanced-debugging.patch
 remove-unaligned-test.patch
+armel-exception-ptr.patch

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