diff options
| author | dim <dim@FreeBSD.org> | 2011-02-27 00:02:48 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-02-27 00:02:48 +0000 |
| commit | 4004d6a3076e94bd23e681411c43682267a202fe (patch) | |
| tree | 2c28e989c6afea68ef1f4e6f1377c3948375dd9e | |
| parent | 76f2936a08a44a2ac6766e368313d64d39813da7 (diff) | |
| download | FreeBSD-src-4004d6a3076e94bd23e681411c43682267a202fe.zip FreeBSD-src-4004d6a3076e94bd23e681411c43682267a202fe.tar.gz | |
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.
| -rw-r--r-- | contrib/llvm/lib/Support/Atomic.cpp | 10 | ||||
| -rw-r--r-- | lib/clang/include/llvm/Config/config.h | 2 | ||||
| -rw-r--r-- | lib/clang/include/llvm/Config/llvm-config.h | 2 |
3 files changed, 7 insertions, 7 deletions
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__) diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 7650f51..6b0629c 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -564,7 +564,7 @@ /* #undef LLVM_MANDIR */ /* Build multithreading support into LLVM */ -#define LLVM_MULTITHREADED 0 +/* #undef LLVM_MULTITHREADED */ /* LLVM architecture name for the native architecture, if available */ #define LLVM_NATIVE_ARCH X86 diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index e6912ba..fc3ec97 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -49,7 +49,7 @@ /* #undef LLVM_MANDIR */ /* Build multithreading support into LLVM */ -#define LLVM_MULTITHREADED 0 +/* #undef LLVM_MULTITHREADED */ /* LLVM architecture name for the native architecture, if available */ #define LLVM_NATIVE_ARCH X86 |
