svn commit: r219076 - in head: contrib/llvm/lib/Support lib/clang/include/llvm/Config

[Dimitry Andric]

Author: dim
Date: Sun Feb 27 00:02:48 2011
New Revision: 219076
URL: http://svn.freebsd.org/changeset/base/219076

Log:
  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.

Modified:
  head/contrib/llvm/lib/Support/Atomic.cpp
  head/lib/clang/include/llvm/Config/config.h
  head/lib/clang/include/llvm/Config/llvm-config.h

Modified: head/contrib/llvm/lib/Support/Atomic.cpp
==============================================================================
--- head/contrib/llvm/lib/Support/Atomic.cpp	Sat Feb 26 23:30:32 2011	(r219075)
+++ head/contrib/llvm/lib/Support/Atomic.cpp	Sun Feb 27 00:02:48 2011	(r219076)
@@ -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(volati
 }
 
 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(volat
 }
 
 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(volat
 }
 
 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__)

Modified: head/lib/clang/include/llvm/Config/config.h
==============================================================================
--- head/lib/clang/include/llvm/Config/config.h	Sat Feb 26 23:30:32 2011	(r219075)
+++ head/lib/clang/include/llvm/Config/config.h	Sun Feb 27 00:02:48 2011	(r219076)
@@ -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

Modified: head/lib/clang/include/llvm/Config/llvm-config.h
==============================================================================
--- head/lib/clang/include/llvm/Config/llvm-config.h	Sat Feb 26 23:30:32 2011	(r219075)
+++ head/lib/clang/include/llvm/Config/llvm-config.h	Sun Feb 27 00:02:48 2011	(r219076)
@@ -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