From 4004d6a3076e94bd23e681411c43682267a202fe Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sun, 27 Feb 2011 00:02:48 +0000
Subject: Instead of defining LLVM_MULTITHREADED as 0 or 1, define or undefine
it, and test appropriately. Otherwise it might erroneously pick up some
pthread primitives, and fail to link.
---
contrib/llvm/lib/Support/Atomic.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'contrib/llvm/lib')
diff --git a/contrib/llvm/lib/Support/Atomic.cpp b/contrib/llvm/lib/Support/Atomic.cpp
index c7b4bff..cf0a562 100644
--- a/contrib/llvm/lib/Support/Atomic.cpp
+++ b/contrib/llvm/lib/Support/Atomic.cpp
@@ -22,7 +22,7 @@ using namespace llvm;
#endif
void sys::MemoryFence() {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
return;
#else
# if defined(__GNUC__)
@@ -38,7 +38,7 @@ void sys::MemoryFence() {
sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
sys::cas_flag new_value,
sys::cas_flag old_value) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
sys::cas_flag result = *ptr;
if (result == old_value)
*ptr = new_value;
@@ -53,7 +53,7 @@ sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
}
sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
++(*ptr);
return *ptr;
#elif defined(__GNUC__)
@@ -66,7 +66,7 @@ sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
}
sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
--(*ptr);
return *ptr;
#elif defined(__GNUC__)
@@ -79,7 +79,7 @@ sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
}
sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
-#if LLVM_MULTITHREADED==0
+#if !defined(LLVM_MULTITHREADED)
*ptr += val;
return *ptr;
#elif defined(__GNUC__)
--
cgit v1.1