From 87f8c3ffd2f5a20dbe1f8384c3de9d429a660bb6 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 27 Nov 2008 17:22:10 +0000 Subject: [PATCH] Merge from GCC: 2008-11-21 Kai Tietz Fix PR/25502 * mh-mingw (BOOT_CFLAGS): Add -Wno-pedantic-ms-format switch. 2008-11-12 Steve Ellcey PR target/27880 * unwind_ipinfo.m4 (GCC_CHECK_UNWIND_GETIPINFO): Change from link test to target based test. --- config/ChangeLog | 11 ++++++++++ config/mh-mingw | 2 +- config/unwind_ipinfo.m4 | 53 +++++++++++++++++++++++++++++-------------------- 3 files changed, 43 insertions(+), 23 deletions(-) rewrite config/unwind_ipinfo.m4 (79%) diff --git a/config/ChangeLog b/config/ChangeLog index 1062d8ee5..e5dfc5185 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,14 @@ +2008-11-21 Kai Tietz + + Fix PR/25502 + * mh-mingw (BOOT_CFLAGS): Add -Wno-pedantic-ms-format switch. + +2008-11-12 Steve Ellcey + + PR target/27880 + * unwind_ipinfo.m4 (GCC_CHECK_UNWIND_GETIPINFO): Change from + link test to target based test. + 2008-08-09 Richard Sandiford * mt-mips16-compat: New file, taken from mt-mips-elfoabi. diff --git a/config/mh-mingw b/config/mh-mingw index 4c49d5d59..d91323ef5 100644 --- a/config/mh-mingw +++ b/config/mh-mingw @@ -1,6 +1,6 @@ # Add -D__USE_MINGW_ACCESS to enable the built compiler to work on Windows # Vista (see PR33281 for details). -BOOT_CFLAGS += -D__USE_MINGW_ACCESS +BOOT_CFLAGS += -D__USE_MINGW_ACCESS -Wno-pedantic-ms-format CFLAGS += -D__USE_MINGW_ACCESS # Increase stack limit to same as Linux default. LDFLAGS += -Wl,--stack,8388608 diff --git a/config/unwind_ipinfo.m4 b/config/unwind_ipinfo.m4 dissimilarity index 79% index 5587d9c3f..a1dc6352b 100644 --- a/config/unwind_ipinfo.m4 +++ b/config/unwind_ipinfo.m4 @@ -1,22 +1,31 @@ -dnl -dnl Check whether _Unwind_GetIPInfo is available. -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_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.]) - fi - AC_MSG_RESULT($gcc_cv_getipinfo) - CXXFLAGS="$ac_save_CXXFLAGS" - AC_LANG_RESTORE -]) +dnl +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_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 +]) -- 2.11.4.GIT