From 59fad7d9339901f8146f2d77cd7818625f0935b8 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 9 Mar 2009 06:16:26 +0000 Subject: Remove configurey-fu to autodetect hash_map and hash_set now that they are no longer used in LLVM. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66406 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 4 --- autoconf/m4/cxx_hash_map.m4 | 59 -------------------------------------------- autoconf/m4/cxx_hash_set.m4 | 60 --------------------------------------------- 3 files changed, 123 deletions(-) delete mode 100644 autoconf/m4/cxx_hash_map.m4 delete mode 100644 autoconf/m4/cxx_hash_set.m4 (limited to 'autoconf') diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 44397b89bd..d6c89e3600 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -842,8 +842,6 @@ AC_FUNC_RAND48 dnl Check for variations in the Standard C++ library and STL. These macros are dnl provided by LLVM in the autoconf/m4 directory. -AC_CXX_HAVE_HASH_MAP -AC_CXX_HAVE_HASH_SET AC_CXX_HAVE_STD_ITERATOR AC_CXX_HAVE_BI_ITERATOR AC_CXX_HAVE_FWD_ITERATOR @@ -1048,8 +1046,6 @@ dnl contains the same list of files as AC_CONFIG_HEADERS below. This ensures the dnl files can be updated automatically when their *.in sources change. AC_CONFIG_HEADERS([include/llvm/Config/config.h]) AC_CONFIG_HEADERS([include/llvm/Support/DataTypes.h]) -AC_CONFIG_HEADERS([include/llvm/ADT/hash_map.h]) -AC_CONFIG_HEADERS([include/llvm/ADT/hash_set.h]) AC_CONFIG_HEADERS([include/llvm/ADT/iterator.h]) dnl Configure the makefile's configuration data diff --git a/autoconf/m4/cxx_hash_map.m4 b/autoconf/m4/cxx_hash_map.m4 deleted file mode 100644 index 71c74b11e1..0000000000 --- a/autoconf/m4/cxx_hash_map.m4 +++ /dev/null @@ -1,59 +0,0 @@ -# Check for hash_map extension. This is from -# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html -AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP], -[AC_CACHE_CHECK([whether the compiler has defining template class std::hash_map], - ac_cv_cxx_have_std_ext_hash_map, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif]], [[hash_map t;]])],[ac_cv_cxx_have_std_ext_hash_map=yes],[ac_cv_cxx_have_std_ext_hash_map=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_std_ext_hash_map" = yes - then - AC_DEFINE(HAVE_STD_EXT_HASH_MAP,1,[Have ext/hash_map>]) - else - AC_DEFINE(HAVE_STD_EXT_HASH_MAP,0,[Does not have ext/hash_map>]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP], -[AC_CACHE_CHECK([whether the compiler has defining template class __gnu_cxx::hash_map], - ac_cv_cxx_have_gnu_ext_hash_map, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#ifdef HAVE_NAMESPACES -using namespace __gnu_cxx; -#endif]], [[hash_map t; ]])],[ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes - then - AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,1,[Have ext/hash_map]) - else - AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,0,[Does not have ext/hash_map]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP], -[AC_CACHE_CHECK([whether the compiler has defining template class ::hash_map], - ac_cv_cxx_have_global_hash_map, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[hash_map t; ]])],[ac_cv_cxx_have_global_hash_map=yes],[ac_cv_cxx_have_global_hash_map=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_global_hash_map" = yes - then - AC_DEFINE(HAVE_GLOBAL_HASH_MAP,1,[Have ]) - else - AC_DEFINE(HAVE_GLOBAL_HASH_MAP,0,[Does not have ]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_HASH_MAP], -[AC_CXX_HAVE_STD_EXT_HASH_MAP - AC_CXX_HAVE_GNU_EXT_HASH_MAP - AC_CXX_HAVE_GLOBAL_HASH_MAP]) - - diff --git a/autoconf/m4/cxx_hash_set.m4 b/autoconf/m4/cxx_hash_set.m4 deleted file mode 100644 index e9d28bfe35..0000000000 --- a/autoconf/m4/cxx_hash_set.m4 +++ /dev/null @@ -1,60 +0,0 @@ -# Check for hash_set extension. This is modified from -# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html -AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET], -[AC_CACHE_CHECK([whether the compiler has defining template class std::hash_set], - ac_cv_cxx_have_std_ext_hash_set, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif]], [[hash_set t; ]])],[ac_cv_cxx_have_std_ext_hash_set=yes],[ac_cv_cxx_have_std_ext_hash_set=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_std_ext_hash_set" = yes - then - AC_DEFINE(HAVE_STD_EXT_HASH_SET,1,[Have hash_set in std namespace]) - else - AC_DEFINE(HAVE_STD_EXT_HASH_SET,0,[Does not have hash_set in std namespace]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET], -[AC_CACHE_CHECK( - [whether the compiler has defining template class __gnu_cxx::hash_set], - ac_cv_cxx_have_gnu_ext_hash_set, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#ifdef HAVE_NAMESPACES -using namespace __gnu_cxx; -#endif]], [[hash_set t; ]])],[ac_cv_cxx_have_gnu_ext_hash_set=yes],[ac_cv_cxx_have_gnu_ext_hash_set=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes - then - AC_DEFINE(HAVE_GNU_EXT_HASH_SET,1,[Have hash_set in gnu namespace]) - else - AC_DEFINE(HAVE_GNU_EXT_HASH_SET,0,[Does not have hash_set in gnu namespace]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET], -[AC_CACHE_CHECK([whether the compiler has defining template class ::hash_set], - ac_cv_cxx_have_global_hash_set, - [AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_PUSH([C++]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[hash_set t; return 0;]])],[ac_cv_cxx_have_global_hash_set=yes],[ac_cv_cxx_have_global_hash_set=no]) - AC_LANG_POP([C++])]) - if test "$ac_cv_cxx_have_global_hash_set" = yes - then - AC_DEFINE(HAVE_GLOBAL_HASH_SET,1,[Have hash_set in global namespace]) - else - AC_DEFINE(HAVE_GLOBAL_HASH_SET,0,[Does not have hash_set in global namespace]) - fi - ]) - -AC_DEFUN([AC_CXX_HAVE_HASH_SET], -[AC_CXX_HAVE_STD_EXT_HASH_SET - AC_CXX_HAVE_GNU_EXT_HASH_SET - AC_CXX_HAVE_GLOBAL_HASH_SET]) - - -- cgit v1.2.3