Split the ENABLE_THREADS #define in two. Now ENABLE_THREADS indicates the ability...

[oota-llvm.git] / include / llvm / System / Atomic.h

diff --git a/include/llvm/System/Atomic.h b/include/llvm/System/Atomic.h
index 5830b37083b56986f82b0799a566f36c7aa2b60d..38388a4b28a9e0a062cd56ad51423244e6ce79ea 100644 (file)
--- a/include/llvm/System/Atomic.h
+++ b/include/llvm/System/Atomic.h
@@ -23,14 +23,8 @@ namespace llvm {
   namespace sys {
     
     inline void MemoryFence() {
-#if !defined(ENABLE_THREADS) || ENABLE_THREADS == 0
-#  if defined(__GNUC__)
-      __asm__ __volatile__("" : : : "memory");
-#  elif defined(_MSC_VER)
-      __asm { };
-#  else
-#    error No memory fence implementation for your platform!
-#  endif
+#if LLVM_MULTITHREADED==0
+      return;
 #else
 #  if defined(__GNUC__)
       __sync_synchronize();
@@ -42,7 +36,7 @@ namespace llvm {
 #endif
 }
 
-#if !defined(ENABLE_THREADS) || ENABLE_THREADS == 0
+#if LLVM_MULTITHREADED==0
     typedef unsigned long cas_flag;
     template<typename T>
     inline T CompareAndSwap(volatile T* dest,