[tbb] 03/06: Remove spurious patch files

[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 d5d19e5f2fc461122ac6b1044afc405c49fbb020
Author: Steve Capper <steven.capper at gmail.com>
Date:   Sun Jul 23 16:54:57 2017 +0100

    Remove spurious patch files
---
 debian/patches/allow-armel-build.patch | 13 -------
 debian/patches/atomic-rework.patch     | 68 ----------------------------------
 2 files changed, 81 deletions(-)

diff --git a/debian/patches/allow-armel-build.patch b/debian/patches/allow-armel-build.patch
deleted file mode 100644
index b7466d3..0000000
--- a/debian/patches/allow-armel-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tbb-4.3~20150611/include/tbb/tbb_machine.h
-===================================================================
---- tbb-4.3~20150611.orig/include/tbb/tbb_machine.h
-+++ tbb-4.3~20150611/include/tbb/tbb_machine.h
-@@ -246,7 +246,7 @@ template<> struct atomic_selector<8> {
-         #include "machine/linux_ia64.h"
-     #elif __powerpc__
-         #include "machine/mac_ppc.h"
--    #elif __arm__
-+    #elif ( defined(__arm__) && (__ARM_ARCH == 7) )
-         #include "machine/gcc_armv7.h"
-     #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT
-         #include "machine/gcc_generic.h"
diff --git a/debian/patches/atomic-rework.patch b/debian/patches/atomic-rework.patch
deleted file mode 100644
index 267ba18..0000000
--- a/debian/patches/atomic-rework.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Use gcc __atomic instead of __sync
-Author: Original author Mathieu Malaterre <malat at debian.org>
-        Promoted to gcc_generic.h and extended by Steve Capper <steven.capper at gmail.com>
-
-Index: tbb-4.3~20150611/include/tbb/machine/gcc_generic.h
-===================================================================
---- tbb-4.3~20150611.orig/include/tbb/machine/gcc_generic.h
-+++ tbb-4.3~20150611/include/tbb/machine/gcc_generic.h
-@@ -55,18 +55,22 @@
-     fence usages where a more lightweight synchronization means (or none at all)
-     could suffice. Thus if you use this header to enable TBB on a new platform,
-     consider forking it and relaxing below helpers as appropriate. **/
--#define __TBB_acquire_consistency_helper()  __sync_synchronize()
--#define __TBB_release_consistency_helper()  __sync_synchronize()
--#define __TBB_full_memory_fence()           __sync_synchronize()
--#define __TBB_control_consistency_helper()  __sync_synchronize()
-+#define __TBB_acquire_consistency_helper()  __atomic_thread_fence(__ATOMIC_SEQ_CST)
-+#define __TBB_release_consistency_helper()  __atomic_thread_fence(__ATOMIC_SEQ_CST)
-+#define __TBB_full_memory_fence()           __atomic_thread_fence(__ATOMIC_SEQ_CST)
-+#define __TBB_control_consistency_helper()  __atomic_thread_fence(__ATOMIC_SEQ_CST)
- 
- #define __TBB_MACHINE_DEFINE_ATOMICS(S,T)                                                         \
- inline T __TBB_machine_cmpswp##S( volatile void *ptr, T value, T comparand ) {                    \
--    return __sync_val_compare_and_swap(reinterpret_cast<volatile T *>(ptr),comparand,value);      \
-+    T retval = comparand;                                                                         \
-+    if (__atomic_compare_exchange_n(reinterpret_cast<volatile T *>(ptr), &retval, value,          \
-+                                        false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST))               \
-+        return retval;                                                                            \
-+   return retval;                                                                                 \
- }                                                                                                 \
-                                                                                                   \
- inline T __TBB_machine_fetchadd##S( volatile void *ptr, T value ) {                               \
--    return __sync_fetch_and_add(reinterpret_cast<volatile T *>(ptr),value);                       \
-+    return __atomic_fetch_add(reinterpret_cast<volatile T *>(ptr), value, __ATOMIC_SEQ_CST);      \
- }                                                                                                 \
- 
- __TBB_MACHINE_DEFINE_ATOMICS(1,int8_t)
-@@ -87,24 +91,25 @@ static inline intptr_t __TBB_machine_lg(
- }
- 
- static inline void __TBB_machine_or( volatile void *ptr, uintptr_t addend ) {
--    __sync_fetch_and_or(reinterpret_cast<volatile uintptr_t *>(ptr),addend);
-+    __atomic_fetch_or(reinterpret_cast<volatile uintptr_t *>(ptr), addend,
-+                         __ATOMIC_SEQ_CST);
- }
- 
- static inline void __TBB_machine_and( volatile void *ptr, uintptr_t addend ) {
--    __sync_fetch_and_and(reinterpret_cast<volatile uintptr_t *>(ptr),addend);
-+    __atomic_fetch_and(reinterpret_cast<volatile uintptr_t *>(ptr), addend,
-+                         __ATOMIC_SEQ_CST);
- }
- 
--
- typedef unsigned char __TBB_Flag;
- 
- typedef __TBB_atomic __TBB_Flag __TBB_atomic_flag;
- 
- inline bool __TBB_machine_try_lock_byte( __TBB_atomic_flag &flag ) {
--    return __sync_lock_test_and_set(&flag,1)==0;
-+    return !__atomic_test_and_set(&flag, __ATOMIC_ACQUIRE);
- }
- 
- inline void __TBB_machine_unlock_byte( __TBB_atomic_flag &flag ) {
--    __sync_lock_release(&flag);
-+    __atomic_clear(&flag, __ATOMIC_RELEASE);
- }
- 
- // Machine specific atomic operations

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