[tbb] __TBB_full_memory_fence has to be a macro

Petr Machata pmachata at fedoraproject.org
Tue Jul 26 15:23:06 UTC 2011


commit 8894973c7ccbde3f23ab7fa10c12261cbb44b6dc
Author: Petr Machata <pmachata at gmail.com>
Date:   Tue Jul 26 17:22:46 2011 +0200

    __TBB_full_memory_fence has to be a macro

 tbb-3.0-mfence.patch |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/tbb-3.0-mfence.patch b/tbb-3.0-mfence.patch
index 1638abd..b209ee7 100644
--- a/tbb-3.0-mfence.patch
+++ b/tbb-3.0-mfence.patch
@@ -1,12 +1,13 @@
 diff -up tbb30_20110419oss/include/tbb/machine/linux_ia32.h\~ tbb30_20110419oss/include/tbb/machine/linux_ia32.h
 --- tbb30_20110419oss/include/tbb/machine/linux_ia32.h~	2011-04-19 13:48:59.000000000 +0200
 +++ tbb30_20110419oss/include/tbb/machine/linux_ia32.h	2011-07-26 16:09:19.986615628 +0200
-@@ -40,7 +40,13 @@
+@@ -40,7 +40,14 @@
  #define __TBB_control_consistency_helper()
  #define __TBB_acquire_consistency_helper() __TBB_compiler_fence()
  #define __TBB_release_consistency_helper() __TBB_compiler_fence()
 -#define __TBB_full_memory_fence()          __asm__ __volatile__("mfence": : :"memory")
-+inline void __TBB_full_memory_fence() {
++#define __TBB_full_memory_fence()          __TBB_full_memory_fence_imp
++inline void __TBB_full_memory_fence_imp() {
 +    int tmp;
 +    __asm__ __volatile__("xchg %0,%0"
 +			 : "=r"(tmp)


More information about the scm-commits mailing list