diff options
| author | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 21:35:46 +0000 |
|---|---|---|
| committer | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 21:35:46 +0000 |
| commit | 7e5cb4d6c841b23b2988a7d258cc643b97eb6cec (patch) | |
| tree | 7f3d326b8ade23a1bd72a9668461ef85e61bae50 /config | |
| parent | 9f5adf91c78f7a560ae0ac68a35f8526bed2c08b (diff) | |
| download | gcc-7e5cb4d6c841b23b2988a7d258cc643b97eb6cec.tar.gz | |
PR target/27880
* config/unwind_ipinfo.m4 (GCC_CHECK_UNWIND_GETIPINFO): Change from
link test to target based test.
* libstdc++/v3/configure.ac: Move call to GCC_CHECK_UNWIND_GETIPINFO.
* libstdc++/v3/configure: Regenerate.
* libjava/configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141804 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/unwind_ipinfo.m4 | 41 |
2 files changed, 31 insertions, 16 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 1062d8ee5e2..84cb7ff7e00 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2008-11-12 Steve Ellcey <sje@cup.hp.com> + + PR target/27880 + * unwind_ipinfo.m4 (GCC_CHECK_UNWIND_GETIPINFO): Change from + link test to target based test. + 2008-08-09 Richard Sandiford <rdsandiford@googlemail.com> * mt-mips16-compat: New file, taken from mt-mips-elfoabi. diff --git a/config/unwind_ipinfo.m4 b/config/unwind_ipinfo.m4 index 5587d9c3fb0..a1dc6352b67 100644 --- a/config/unwind_ipinfo.m4 +++ b/config/unwind_ipinfo.m4 @@ -1,22 +1,31 @@ dnl -dnl Check whether _Unwind_GetIPInfo is available. +dnl Check whether _Unwind_GetIPInfo is available without doing a link +dnl test so we can use this with libstdc++-v3 and libjava. Need to +dnl use $target to set defaults because automatic checking is not possible +dnl without a link test (and maybe even with a link test). dnl + AC_DEFUN([GCC_CHECK_UNWIND_GETIPINFO], [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fno-exceptions" - AC_MSG_CHECKING([for _Unwind_GetIPInfo]) - AC_CACHE_VAL(gcc_cv_getipinfo, [ - AC_TRY_LINK([extern "C" { extern void _Unwind_GetIPInfo(); }], - [_Unwind_GetIPInfo();], - [gcc_cv_getipinfo=yes], - [gcc_cv_getipinfo=no]) - ]) - if test $gcc_cv_getipinfo = yes; then + AC_ARG_WITH(system-libunwind, + [ --with-system-libunwind use installed libunwind]) + # If system-libunwind was not specifically set, pick a default setting. + if test x$with_system_libunwind = x; then + case ${target} in + ia64-*-hpux*) with_system_libunwind=yes ;; + *) with_system_libunwind=no ;; + esac + fi + # Based on system-libunwind and target, do we have ipinfo? + if test x$with_system_libunwind = xyes; then + case ${target} in + ia64-*-*) have_unwind_getipinfo=no ;; + *) have_unwind_getipinfo=yes ;; + esac + else + have_unwind_getipinfo=yes + fi + + if test x$have_unwind_getipinfo = xyes; then AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.]) fi - AC_MSG_RESULT($gcc_cv_getipinfo) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE ]) |