d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of defining LLVM_MULTITHREADED as 0 or 1, define or undefine it,

Browse Source 
and test appropriately.  Otherwise it might erroneously pick up some
pthread primitives, and fail to link.
This commit is contained in:
Dimitry Andric 2011-02-27 00:02:48 +00:00
parent ded66df8cb
commit 86b360ada3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/llvm/lib/Support/Atomic.cpp
View File

@ -22,7 +22,7 @@ using namespace llvm;
#endif #endif
void sys::MemoryFence() { void sys::MemoryFence() {
#if LLVM_MULTITHREADED==0 #if !defined(LLVM_MULTITHREADED)
return; return;
#else #else
# if defined(__GNUC__) # if defined(__GNUC__)
@ -38,7 +38,7 @@ void sys::MemoryFence() {
sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr, sys::cas_flag sys::CompareAndSwap(volatile sys::cas_flag* ptr,
sys::cas_flag new_value, sys::cas_flag new_value,
sys::cas_flag old_value) { sys::cas_flag old_value) {
#if LLVM_MULTITHREADED==0 #if !defined(LLVM_MULTITHREADED)
sys::cas_flag result = *ptr; sys::cas_flag result = *ptr;
if (result == old_value) if (result == old_value)
*ptr = new_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) { sys::cas_flag sys::AtomicIncrement(volatile sys::cas_flag* ptr) {
#if LLVM_MULTITHREADED==0 #if !defined(LLVM_MULTITHREADED)
++(*ptr); ++(*ptr);
return *ptr; return *ptr;
#elif defined(__GNUC__) #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) { sys::cas_flag sys::AtomicDecrement(volatile sys::cas_flag* ptr) {
#if LLVM_MULTITHREADED==0 #if !defined(LLVM_MULTITHREADED)
--(*ptr); --(*ptr);
return *ptr; return *ptr;
#elif defined(__GNUC__) #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) { sys::cas_flag sys::AtomicAdd(volatile sys::cas_flag* ptr, sys::cas_flag val) {
#if LLVM_MULTITHREADED==0 #if !defined(LLVM_MULTITHREADED)
*ptr += val; *ptr += val;
return *ptr; return *ptr;
#elif defined(__GNUC__) #elif defined(__GNUC__)

2
lib/clang/include/llvm/Config/config.h
View File

@ -564,7 +564,7 @@
/* #undef LLVM_MANDIR */ /* #undef LLVM_MANDIR */
/* Build multithreading support into LLVM */ /* Build multithreading support into LLVM */
#define LLVM_MULTITHREADED 0 /* #undef LLVM_MULTITHREADED */
/* LLVM architecture name for the native architecture, if available */ /* LLVM architecture name for the native architecture, if available */
#define LLVM_NATIVE_ARCH X86 #define LLVM_NATIVE_ARCH X86

2
lib/clang/include/llvm/Config/llvm-config.h
View File

@ -49,7 +49,7 @@
/* #undef LLVM_MANDIR */ /* #undef LLVM_MANDIR */
/* Build multithreading support into LLVM */ /* Build multithreading support into LLVM */
#define LLVM_MULTITHREADED 0 /* #undef LLVM_MULTITHREADED */
/* LLVM architecture name for the native architecture, if available */ /* LLVM architecture name for the native architecture, if available */
#define LLVM_NATIVE_ARCH X86 #define LLVM_NATIVE_ARCH X86