4 files changed, 44 insertions, 6 deletions
diff --git a/include/llvm/ADT/iterator.in b/include/llvm/ADT/iterator.in
index 072beb71ee..f74aca28a6 100644
--- a/include/llvm/ADT/iterator.in
+++ b/include/llvm/ADT/iterator.in
@@ -30,8 +30,12 @@
 
 #include <iterator>
 
-#if !@HAVE_BI_ITERATOR@
-# if @HAVE_STD_ITERATOR@
+#undef HAVE_BI_ITERATOR
+#undef HAVE_STD_ITERATOR
+#undef HAVE_FWD_ITERATOR
+
+#if !HAVE_BI_ITERATOR
+# if HAVE_STD_ITERATOR
 /// If the bidirectional iterator is not defined, we attempt to define it in
 /// terms of the C++ standard iterator. Otherwise, we import it with a "using"
 /// statement.
@@ -47,8 +51,8 @@ struct bidirectional_iterator
 using std::bidirectional_iterator;
 #endif
 
-#if !@HAVE_FWD_ITERATOR@
-# if @HAVE_STD_ITERATOR@
+#if !HAVE_FWD_ITERATOR
+# if HAVE_STD_ITERATOR
 /// If the forward iterator is not defined, attempt to define it in terms of
 /// the C++ standard iterator. Otherwise, we import it with a "using" statement.
 ///
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 82ae2d2fb2..e9cdcdf587 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -18,6 +18,9 @@
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
+/* Does not have bi-directional iterator */
+#undef HAVE_BI_ITERATOR
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -34,6 +37,9 @@
    */
 #undef HAVE_FINITE_IN_IEEEFP_H
 
+/* Does not have forward iterator */
+#undef HAVE_FWD_ITERATOR
+
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
@@ -46,6 +52,18 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
+/* Does not have <hash_map> */
+#undef HAVE_GLOBAL_HASH_MAP
+
+/* Does not have hash_set in global namespace */
+#undef HAVE_GLOBAL_HASH_SET
+
+/* Does not have ext/hash_map */
+#undef HAVE_GNU_EXT_HASH_MAP
+
+/* Does not have hash_set in gnu namespace */
+#undef HAVE_GNU_EXT_HASH_SET
+
 /* Define to 1 if the system has the type `int64_t'. */
 #undef HAVE_INT64_T
 
@@ -108,12 +126,21 @@
 /* Define to have the %a format string */
 #undef HAVE_PRINTF_A
 
+/* Have pthread_mutex_lock */
+#undef HAVE_PTHREAD_MUTEX_LOCK
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Does not have ext/hash_map> */
+#undef HAVE_STD_EXT_HASH_MAP
+
+/* Does not have hash_set in std namespace */
+#undef HAVE_STD_EXT_HASH_SET
+
 /* Define to 1 if your compiler defines std::isinf in the <cmath> header file.
    */
 #undef HAVE_STD_ISINF_IN_CMATH
@@ -122,6 +149,9 @@
    */
 #undef HAVE_STD_ISNAN_IN_CMATH
 
+/* Does not have std namespace iterator */
+#undef HAVE_STD_ITERATOR
+
 /* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
diff --git a/include/llvm/Support/MutexGuard.h b/include/llvm/Support/MutexGuard.h
index 48428b8cde..427e0c3a22 100644
--- a/include/llvm/Support/MutexGuard.h
+++ b/include/llvm/Support/MutexGuard.h
@@ -17,7 +17,9 @@
 #ifndef SUPPORT_THREADSUPPORT_H
 #define SUPPORT_THREADSUPPORT_H
 
-#if @HAVE_PTHREAD_MUTEX_LOCK@
+#undef HAVE_PTHREAD_MUTEX_LOCK
+
+#ifdef HAVE_PTHREAD_MUTEX_LOCK
 #include "llvm/Support/ThreadSupport-PThreads.h"
 #else
 #include "llvm/Support/ThreadSupport-NoSupport.h"
diff --git a/include/llvm/Support/ThreadSupport.h.in b/include/llvm/Support/ThreadSupport.h.in
index 48428b8cde..427e0c3a22 100644
--- a/include/llvm/Support/ThreadSupport.h.in
+++ b/include/llvm/Support/ThreadSupport.h.in
@@ -17,7 +17,9 @@
 #ifndef SUPPORT_THREADSUPPORT_H
 #define SUPPORT_THREADSUPPORT_H
 
-#if @HAVE_PTHREAD_MUTEX_LOCK@
+#undef HAVE_PTHREAD_MUTEX_LOCK
+
+#ifdef HAVE_PTHREAD_MUTEX_LOCK
 #include "llvm/Support/ThreadSupport-PThreads.h"
 #else
 #include "llvm/Support/ThreadSupport-NoSupport.h"