Split the ENABLE_THREADS #define in two. Now ENABLE_THREADS indicates the ability...

[oota-llvm.git] / autoconf / configure.ac

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 56853e96bf189b897c82f9227fa4bae421b9253b..7f625d4bed15c38bcb6a774c13fb31bd6215ea36 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -372,6 +372,7 @@ case "$enableval" in
   default) AC_SUBST(ENABLE_THREADS,[1]) ;;
   *) AC_MSG_ERROR([Invalid setting for --enable-threads. Use "yes" or "no"]) ;;
 esac
+AC_DEFINE_UNQUOTED([ENABLE_THREADS],$ENABLE_THREADS,[Define if threads enabled])
 
 dnl Allow building without position independent code
 AC_ARG_ENABLE(pic,
@@ -897,24 +898,22 @@ if test "$llvm_cv_platform_type" = "Unix" ; then
 fi
 
 dnl atomic builtins are required for threading support.
-if test "$ENABLE_THREADS" -eq 1 ; then
-  AC_MSG_CHECKING(for GCC atomic builtins)
-  AC_LINK_IFELSE(
-       AC_LANG_SOURCE(
-          [[int main() { 
-              volatile unsigned long val = 1;
-              __sync_synchronize();
-              __sync_val_compare_and_swap(&val, 1, 0);
-              return 0;
-            }
-          ]]),
-        AC_MSG_RESULT(yes),
-        AC_MSG_RESULT(no)
-        AC_SUBST(ENABLE_THREADS, [0])
-        AC_MSG_WARN([Threading support disabled because atomic builtins are missing]))
-fi
+AC_MSG_CHECKING(for GCC atomic builtins)
+AC_LINK_IFELSE(
+  AC_LANG_SOURCE(
+    [[int main() { 
+        volatile unsigned long val = 1;
+        __sync_synchronize();
+        __sync_val_compare_and_swap(&val, 1, 0);
+        return 0;
+      }
+    ]]),
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(LLVM_MULTITHREADED, 1, Build multithreading support into LLVM),
+  AC_MSG_RESULT(no)
+  AC_DEFINE(LLVM_MULTITHREADED, 0, Build multithreading support into LLVM)
+  AC_MSG_WARN([LLVM will be built thread-unsafe because atomic builtins are missing]))
 
-AC_DEFINE_UNQUOTED([ENABLE_THREADS],$ENABLE_THREADS,[Define if threads enabled])
 
 dnl===-----------------------------------------------------------------------===
 dnl===