From: Reid Spencer Date: Sun, 16 Jan 2005 02:58:39 +0000 (+0000) Subject: Provide support for HP/UX aCC compiler's variant of hash_map and hash_set X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8085cff7ebbee3efd932b8f27f67187a4ba707e1;p=oota-llvm.git Provide support for HP/UX aCC compiler's variant of hash_map and hash_set (RogueWave). These are implemented in rw/stdex/hash_map.h and rw/stdex/hash_set.h on HP/UX. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19600 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 0eae14fb7c1..4fd1e295ef6 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -423,6 +423,7 @@ AC_HEADER_TIME AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h]) AC_CHECK_HEADERS([malloc.h signal.h stdint.h unistd.h utime.h windows.h]) AC_CHECK_HEADERS([sys/mman.h sys/param.h sys/resource.h sys/time.h sys/types.h]) +AC_CHECK_HEADERS([rw/stdex/hash_map.h rw/stdex/hash_set.h]) dnl===-----------------------------------------------------------------------=== dnl=== diff --git a/configure b/configure index dd167518993..44171c459e4 100755 --- a/configure +++ b/configure @@ -1591,10 +1591,10 @@ subdirs="$subdirs projects/llvm-reopt" subdirs="$subdirs projects/llvm-gcc" ;; - "llvm-java") + "Java") subdirs="$subdirs projects/llvm-java" - ;; + ;; "llvm-tv") subdirs="$subdirs projects/llvm-tv" @@ -26595,6 +26595,157 @@ done +for ac_header in rw/stdex/hash_map.h rw/stdex/hash_set.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------------- ## +## Report this to llvmbugs@cs.uiuc.edu ## +## ----------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + echo "$as_me:$LINENO: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then diff --git a/include/llvm/ADT/hash_map.in b/include/llvm/ADT/hash_map.in index 15cded2f8c8..ca609804396 100644 --- a/include/llvm/ADT/hash_map.in +++ b/include/llvm/ADT/hash_map.in @@ -23,11 +23,13 @@ // 2.95.x :: hash_map // 3.0.4 std ext/hash_map // 3.1 __gnu_cxx ext/hash_map +// HP aCC6 std stdex/rw/hashm*ap.h // #undef HAVE_GNU_EXT_HASH_MAP #undef HAVE_STD_EXT_HASH_MAP #undef HAVE_GLOBAL_HASH_MAP +#undef HAVE_RW_STDEX_HASH_MAP_H #if HAVE_GNU_EXT_HASH_MAP // This is for GCC-3.1+ which puts hash in ext/hash_map @@ -51,12 +53,51 @@ # define HASH_NAMESPACE std # endif +// HP aCC doesn't include an SGI-like hash_map. For this platform (or +// any others using Rogue Wave Software's Tools.h++ library), we wrap +// around them in std:: +#elif HAVE_RW_STDEX_HASH_MAP_H +# include +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE std +# endif + // Give a warning if we couldn't find it, instead of (or in addition to) // randomly doing something dumb. #else # warning "Autoconfiguration failed to find the hash_map header file." #endif +// we wrap Rogue Wave Tools.h++ rw_hashmap into something SGI-looking, here: +#ifdef HAVE_RW_STDEX_HASH_MAP_H +namespace HASH_NAMESPACE { + +template struct hash { + unsigned int operator()(const unsigned int& x) const { + return x; + } +}; + +template , + class _EqualKey = equal_to, + class _A = allocator > +class hash_map : public rw_hashmap { +}; + +template , + class _EqualKey = equal_to, + class _A = allocator > +class hash_multimap : public rw_hashmultimap { +}; + +} // end HASH_NAMESPACE; +#endif + using HASH_NAMESPACE::hash_map; using HASH_NAMESPACE::hash_multimap; using HASH_NAMESPACE::hash; diff --git a/include/llvm/ADT/hash_set.in b/include/llvm/ADT/hash_set.in index 1c7677d6ade..1557579cd4a 100644 --- a/include/llvm/ADT/hash_set.in +++ b/include/llvm/ADT/hash_set.in @@ -24,11 +24,13 @@ // 2.95.x :: hash_set // 3.0.4 std ext/hash_set // 3.1 __gnu_cxx ext/hash_set +// HP aCC6 std stdex/rw/hashset.h // #undef HAVE_GNU_EXT_HASH_SET #undef HAVE_STD_EXT_HASH_SET #undef HAVE_GLOBAL_HASH_SET +#undef HAVE_RW_STDEX_HASH_SET_H // GCC versions 3.1 and later put hash_set in and in // the __gnu_cxx namespace. @@ -53,12 +55,43 @@ # define HASH_NAMESPACE std # endif +// HP aCC doesn't include an SGI-like hash_set. For this platform (or +// any others using Rogue Wave Software's Tools.h++ library), we wrap +// around them in std:: +#elif HAVE_RW_STDEX_HASH_SET_H +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE std +# endif + // Give a warning if we couldn't find it, instead of (or in addition to) // randomly doing something dumb. #else # warning "Autoconfiguration failed to find the hash_set header file." #endif +// we wrap Rogue Wave Tools.h++ rw_hashset into something SGI-looking, here: +#ifdef HAVE_RW_STDEX_HASH_SET_H +namespace HASH_NAMESPACE { + +/* +template struct hash { + unsigned int operator()(const unsigned int& x) const { + return x; + } +}; +*/ + +template , + class _EqualKey = equal_to, + class _A = allocator > +class hash_set : public rw_hashset { +}; + +} // end HASH_NAMESPACE; +#endif + using HASH_NAMESPACE::hash_set; using HASH_NAMESPACE::hash; diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index b113793e7fd..d3821324644 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -231,6 +231,12 @@ /* Define to 1 if you have the `rindex' function. */ #undef HAVE_RINDEX +/* Define to 1 if you have the header file. */ +#undef HAVE_RW_STDEX_HASH_MAP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_RW_STDEX_HASH_SET_H + /* Define to 1 if you have the `sbrk' function. */ #undef HAVE_SBRK