diff options
| author | Logan Chien <loganchien@google.com> | 2011-12-16 09:08:45 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-12-16 13:28:58 +0800 |
| commit | a1e6e241a813f81be2d2f36ab60c950ca297574b (patch) | |
| tree | cf2d7ec5c63f40e2b66d8be7737496719a0d7902 /lib/Support/Threading.cpp | |
| parent | ac212abcc6d858470ad35ce7d660af0c1800364a (diff) | |
| parent | ddecfe54a35ffbe0675f7f33e493734fd60b2495 (diff) | |
| download | external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.zip external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.tar.gz external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.tar.bz2 | |
Merge with LLVM upstream r146714 (Dec 16th 2011)
Change-Id: Ied458adb08bf9a69250cbcee9b14b44d17e8701a
Diffstat (limited to 'lib/Support/Threading.cpp')
| -rw-r--r-- | lib/Support/Threading.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Support/Threading.cpp b/lib/Support/Threading.cpp index 8f0bb93..7483225 100644 --- a/lib/Support/Threading.cpp +++ b/lib/Support/Threading.cpp @@ -24,7 +24,7 @@ static bool multithreaded_mode = false; static sys::Mutex* global_lock = 0; bool llvm::llvm_start_multithreaded() { -#if ENABLE_THREADS != 0 +#if LLVM_ENABLE_THREADS != 0 assert(!multithreaded_mode && "Already multithreaded!"); multithreaded_mode = true; global_lock = new sys::Mutex(true); @@ -39,7 +39,7 @@ bool llvm::llvm_start_multithreaded() { } void llvm::llvm_stop_multithreaded() { -#if ENABLE_THREADS != 0 +#if LLVM_ENABLE_THREADS != 0 assert(multithreaded_mode && "Not currently multithreaded!"); // We fence here to insure that all threaded operations are complete BEFORE we @@ -63,7 +63,7 @@ void llvm::llvm_release_global_lock() { if (multithreaded_mode) global_lock->release(); } -#if ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) +#if LLVM_ENABLE_THREADS != 0 && defined(HAVE_PTHREAD_H) #include <pthread.h> struct ThreadInfo { @@ -102,7 +102,7 @@ void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData, error: ::pthread_attr_destroy(&Attr); } -#elif ENABLE_THREADS!=0 && defined(LLVM_ON_WIN32) +#elif LLVM_ENABLE_THREADS!=0 && defined(LLVM_ON_WIN32) #include "Windows/Windows.h" #include <process.h> |