Regenerated.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9850 91177308-0d34-0410-b5e6-96231b3b80d8

configure

@@ -20846,9 +20846,9 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether the compiler has ext/hash_map" >&5
+echo "$as_me:$LINENO: checking whether the compiler has <ext/hash_map> defining template class std::hash_map" >&5
-echo $ECHO_N "checking whether the compiler has ext/hash_map... $ECHO_C" >&6
+echo $ECHO_N "checking whether the compiler has <ext/hash_map> defining template class std::hash_map... $ECHO_C" >&6
-if test "${ac_cv_cxx_have_ext_hash_map+set}" = set; then
+if test "${ac_cv_cxx_have_std_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -20874,7 +20874,7 @@ using namespace std;
 int
 main ()
 {
-hash_map<int, int> t; return 0;
+hash_map<int, int> t;
   ;
   return 0;
 }
@@ -20891,51 +20891,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_map=std
+  ac_cv_cxx_have_std_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_map=no
+ac_cv_cxx_have_std_ext_hash_map=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ext/hash_map>
-#ifdef HAVE_NAMESPACES
-using namespace __gnu_cxx;
-#endif
-int
-main ()
-{
-hash_map<int, int> t; return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_map=gnu
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cxx_have_ext_hash_map=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
@@ -20944,28 +20905,154 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_std_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6
+echo "${ECHO_T}$ac_cv_cxx_have_std_ext_hash_map" >&6
-if test "$ac_cv_cxx_have_ext_hash_map" = std; then
+ if test "$ac_cv_cxx_have_std_ext_hash_map" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_STD_EXT_HASH_MAP
 _ACEOF
 
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map" >&5
+echo $ECHO_N "checking whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_gnu_ext_hash_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ext/hash_map>
+#ifdef HAVE_NAMESPACES
+using namespace __gnu_cxx;
+#endif
+int
+main ()
+{
+hash_map<int,int> t;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_cxx_have_gnu_ext_hash_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_have_gnu_ext_hash_map=no
 fi
-if test "$ac_cv_cxx_have_ext_hash_map" = gnu; then
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_gnu_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_gnu_ext_hash_map" >&6
+ if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_GNU_EXT_HASH_MAP
 _ACEOF
 
-fi
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has <hash_map> defining template class ::hash_map" >&5
+echo $ECHO_N "checking whether the compiler has <hash_map> defining template class ::hash_map... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_global_hash_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
 
-echo "$as_me:$LINENO: checking whether the compiler has ext/hash_set" >&5
+
-echo $ECHO_N "checking whether the compiler has ext/hash_set... $ECHO_C" >&6
+
-if test "${ac_cv_cxx_have_ext_hash_set+set}" = set; then
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hash_map>
+int
+main ()
+{
+hash_map<int,int> t;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_cxx_have_global_hash_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_have_global_hash_map=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_global_hash_map" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_global_hash_map" >&6
+ if test "$ac_cv_cxx_have_global_hash_map" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GLOBAL_HASH_MAP
+_ACEOF
+
+ fi
+echo "$as_me:$LINENO: checking whether the compiler has <ext/hash_set> defining template class std::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has <ext/hash_set> defining template class std::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_std_ext_hash_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -20991,7 +21078,7 @@ using namespace std;
 int
 main ()
 {
-hash_set<int> t; return 0;
+hash_set<int> t;
   ;
   return 0;
 }
@@ -21008,14 +21095,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_set=std
+  ac_cv_cxx_have_std_ext_hash_set=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_set=no
+ac_cv_cxx_have_std_ext_hash_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_std_ext_hash_set" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_std_ext_hash_set" >&6
+ if test "$ac_cv_cxx_have_std_ext_hash_set" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_EXT_HASH_SET
+_ACEOF
+
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_gnu_ext_hash_set+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -21030,6 +21147,72 @@ using namespace __gnu_cxx;
 int
 main ()
 {
+hash_set<int> t;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_cxx_have_gnu_ext_hash_set=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_have_gnu_ext_hash_set=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_gnu_ext_hash_set" >&5
+echo "${ECHO_T}$ac_cv_cxx_have_gnu_ext_hash_set" >&6
+ if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_EXT_HASH_SET
+_ACEOF
+
+ fi
+ echo "$as_me:$LINENO: checking whether the compiler has <hash_set> defining template class ::hash_set" >&5
+echo $ECHO_N "checking whether the compiler has <hash_set> defining template class ::hash_set... $ECHO_C" >&6
+if test "${ac_cv_cxx_have_global_hash_set+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+  ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hash_set>
+int
+main ()
+{
 hash_set<int> t; return 0;
   ;
   return 0;
@@ -21047,12 +21230,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_cxx_have_ext_hash_set=gnu
+  ac_cv_cxx_have_global_hash_set=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_cxx_have_ext_hash_set=no
+ac_cv_cxx_have_global_hash_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
@@ -21061,25 +21244,16 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_set" >&5
+echo "$as_me:$LINENO: result: $ac_cv_cxx_have_global_hash_set" >&5
-echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_set" >&6
+echo "${ECHO_T}$ac_cv_cxx_have_global_hash_set" >&6
-if test "$ac_cv_cxx_have_ext_hash_set" = std; then
+ if test "$ac_cv_cxx_have_global_hash_set" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_EXT_HASH_SET
+#define HAVE_GLOBAL_HASH_SET
 _ACEOF
 
-fi
+ fi
-if test "$ac_cv_cxx_have_ext_hash_set" = gnu; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_EXT_HASH_SET
-_ACEOF
-
-fi
-
 echo "$as_me:$LINENO: checking whether the compiler has ext/slist" >&5
 echo $ECHO_N "checking whether the compiler has ext/slist... $ECHO_C" >&6
 if test "${ac_cv_cxx_have_ext_slist+set}" = set; then

include/Config/config.h.in

@@ -54,10 +54,20 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header <hash_map> that defines template class
+   ::hash_map. */
+#undef HAVE_GLOBAL_HASH_MAP
+
+/* Define if the compiler has a header <hash_set> that defines template class
+   ::hash_set. */
+#undef HAVE_GLOBAL_HASH_SET
+
+/* Define if the compiler has a header <ext/hash_map> that defines template
+   class __gnu_cxx::hash_map. */
 #undef HAVE_GNU_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in __gnu_cc */
+/* Define if the compiler has a header <ext/hash_set> that defines template
+   class __gnu_cxx::hash_set. */
 #undef HAVE_GNU_EXT_HASH_SET
 
 /* Define to 1 if the system has the type `int64_t'. */
@@ -100,6 +110,9 @@
 /* define if the compiler implements namespaces */
 #undef HAVE_NAMESPACES
 
+/* Define to have the %a format string */
+#undef HAVE_PRINTF_A
+
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
@@ -109,10 +122,12 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header <ext/hash_map> that defines template
+   class std::hash_map. */
 #undef HAVE_STD_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in std */
+/* Define if the compiler has a header <ext/hash_set> that defines template
+   class std::hash_set. */
 #undef HAVE_STD_EXT_HASH_SET
 
 /* define if the compiler has STL iterators */
@@ -226,6 +241,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
-
-/* Define to have the %a format string in printf() */
-#undef HAVE_PRINTF_A

include/llvm/Config/config.h.in

@@ -54,10 +54,20 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header <hash_map> that defines template class
+   ::hash_map. */
+#undef HAVE_GLOBAL_HASH_MAP
+
+/* Define if the compiler has a header <hash_set> that defines template class
+   ::hash_set. */
+#undef HAVE_GLOBAL_HASH_SET
+
+/* Define if the compiler has a header <ext/hash_map> that defines template
+   class __gnu_cxx::hash_map. */
 #undef HAVE_GNU_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in __gnu_cc */
+/* Define if the compiler has a header <ext/hash_set> that defines template
+   class __gnu_cxx::hash_set. */
 #undef HAVE_GNU_EXT_HASH_SET
 
 /* Define to 1 if the system has the type `int64_t'. */
@@ -100,6 +110,9 @@
 /* define if the compiler implements namespaces */
 #undef HAVE_NAMESPACES
 
+/* Define to have the %a format string */
+#undef HAVE_PRINTF_A
+
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
@@ -109,10 +122,12 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* define if the compiler has ext/hash_map */
+/* Define if the compiler has a header <ext/hash_map> that defines template
+   class std::hash_map. */
 #undef HAVE_STD_EXT_HASH_MAP
 
-/* define if the compiler has ext/hash_set in std */
+/* Define if the compiler has a header <ext/hash_set> that defines template
+   class std::hash_set. */
 #undef HAVE_STD_EXT_HASH_SET
 
 /* define if the compiler has STL iterators */
@@ -226,6 +241,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
-
-/* Define to have the %a format string in printf() */
-#undef HAVE_PRINTF_A