dba72839e1
- Since the __TBB_full_memory_fence macro was function-call-like, it stole () intended for function invocation. GCC now warns about this.
22 lines
933 B
Diff
22 lines
933 B
Diff
diff -up tbb40_20110809oss/include/tbb/machine/linux_ia32.h\~ tbb40_20110809oss/include/tbb/machine/linux_ia32.h
|
|
--- tbb40_20110809oss/include/tbb/machine/linux_ia32.h~ 2011-08-24 15:51:56.000000000 +0200
|
|
+++ tbb40_20110809oss/include/tbb/machine/linux_ia32.h 2011-10-18 15:04:01.994271994 +0200
|
|
@@ -42,7 +42,14 @@
|
|
#define __TBB_control_consistency_helper() __TBB_compiler_fence()
|
|
#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")
|
|
+#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)
|
|
+ : "r"(tmp)
|
|
+ : "memory");
|
|
+}
|
|
|
|
#if __TBB_ICC_ASM_VOLATILE_BROKEN
|
|
#define __TBB_VOLATILE
|
|
|
|
Diff finished. Tue Oct 18 15:04:09 2011
|