From 5ea5dde276499ca15ff1daf85dafadf48bb0f792 Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 8 Dec 2008 11:51:32 +0000 Subject: [PATCH] 2008-12-08 Paolo Carlini * include/tr1_impl/cmath: Undef requof / remquol too; add using declarations. * acinclude.m4 [GLIBCXX_CHECK_C99_TR1]: Check remquof / remquol too. * testsuite/tr1/8_c_compatibility/cmath/functions.cc: Adjust. * configure: Regenerate. 2008-12-08 Edward Smith-Rowland <3dw4rd@verizon.net> * include/bits/forward_list.h: Fixed spurious "forward_swap" in doxy. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142548 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 12 ++++ libstdc++-v3/acinclude.m4 | 4 +- libstdc++-v3/configure | 75 ++++++++++------------ libstdc++-v3/include/bits/forward_list.h | 6 +- libstdc++-v3/include/tr1_impl/cmath | 8 +-- .../tr1/8_c_compatibility/cmath/functions.cc | 6 +- 6 files changed, 59 insertions(+), 52 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7bcae27..ed969fa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2008-12-08 Paolo Carlini + + * include/tr1_impl/cmath: Undef remquof / remquol too; add using + declarations. + * acinclude.m4 [GLIBCXX_CHECK_C99_TR1]: Check remquof / remquol too. + * testsuite/tr1/8_c_compatibility/cmath/functions.cc: Adjust. + * configure: Regenerate. + +2008-12-08 Edward Smith-Rowland <3dw4rd@verizon.net> + + * include/bits/forward_list.h: Fixed spurious "forward_swap" in doxy. + 2008-12-06 Paolo Carlini PR libstdc++/38421 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index bec563f..f4a8346 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1523,8 +1523,8 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [ remainderf(0.0f, 0.0f); remainderl(0.0l, 0.0l); remquo(0.0, 0.0, 0); - remquo(0.0f, 0.0f, 0); - remquo(0.0l, 0.0l, 0); + remquof(0.0f, 0.0f, 0); + remquol(0.0l, 0.0l, 0); rint(0.0); rintf(0.0f); rintl(0.0l); diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index c344b4c..23b0500 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -1075,10 +1075,10 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-system-libunwind use installed libunwind --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-system-libunwind use installed libunwind --with-gxx-include-dir=DIR installation directory for include files @@ -20965,8 +20965,8 @@ typedef double_t my_double_t; remainderf(0.0f, 0.0f); remainderl(0.0l, 0.0l); remquo(0.0, 0.0, 0); - remquo(0.0f, 0.0f, 0); - remquo(0.0l, 0.0l, 0); + remquof(0.0f, 0.0f, 0); + remquol(0.0l, 0.0l, 0); rint(0.0); rintf(0.0f); rintl(0.0l); @@ -41961,40 +41961,6 @@ _ACEOF fi - # For _Unwind_GetIPInfo. - - -# Check whether --with-system-libunwind or --without-system-libunwind was given. -if test "${with_system_libunwind+set}" = set; then - withval="$with_system_libunwind" - -fi; - # 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 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETIPINFO 1 -_ACEOF - - fi - - # For iconv support. if test "X$prefix" = "XNONE"; then @@ -104361,13 +104327,42 @@ _ACEOF _ACEOF fi +fi + +# Check for _Unwind_GetIPInfo. - # Assume we have _Unwind_GetIPInfo for cross-compiles. - cat >>confdefs.h <<\_ACEOF + +# Check whether --with-system-libunwind or --without-system-libunwind was given. +if test "${with_system_libunwind+set}" = set; then + withval="$with_system_libunwind" + +fi; + # 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 + +cat >>confdefs.h <<\_ACEOF #define HAVE_GETIPINFO 1 _ACEOF -fi + fi + + # Check whether --enable-linux-futex or --disable-linux-futex was given. if test "${enable_linux_futex+set}" = set; then diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index cb73978..473982c 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -1311,21 +1311,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const forward_list<_Tp, _Alloc>& __ly) { return !(__ly < __lx); } - /// See std::forward_list::forward_swap(). + /// See std::forward_list::swap(). template inline void swap(forward_list<_Tp, _Alloc>& __lx, forward_list<_Tp, _Alloc>& __ly) { __lx.swap(__ly); } - /// See std::forward_list::forward_swap(). + /// See std::forward_list::swap(). template inline void swap(forward_list<_Tp, _Alloc>&& __lx, forward_list<_Tp, _Alloc>& __ly) { __lx.swap(__ly); } - /// See std::forward_list::forward_swap(). + /// See std::forward_list::swap(). template inline void swap(forward_list<_Tp, _Alloc>& __lx, diff --git a/libstdc++-v3/include/tr1_impl/cmath b/libstdc++-v3/include/tr1_impl/cmath index d969a8f..044d122 100644 --- a/libstdc++-v3/include/tr1_impl/cmath +++ b/libstdc++-v3/include/tr1_impl/cmath @@ -119,8 +119,8 @@ #undef remainderf #undef remainderl #undef remquo -#undef remquo -#undef remquo +#undef remquof +#undef remquol #undef rint #undef rintf #undef rintl @@ -266,8 +266,8 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 using ::remainderl; using ::remquo; - using ::remquo; - using ::remquo; + using ::remquof; + using ::remquol; using ::rint; using ::rintf; diff --git a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/functions.cc b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/functions.cc index 3bb6d9d..6bbb148 100644 --- a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/functions.cc +++ b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/functions.cc @@ -2,7 +2,7 @@ // 2006-02-07 Paolo Carlini // -// Copyright (C) 2006 Free Software Foundation, Inc. +// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -156,8 +156,8 @@ void test01() ldret = std::tr1::remainderl(ld0, ld0); ret = std::tr1::remquo(d0, d0, pquo); - fret = std::tr1::remquo(f0, f0, pquo); - ldret = std::tr1::remquo(ld0, ld0, pquo); + fret = std::tr1::remquof(f0, f0, pquo); + ldret = std::tr1::remquol(ld0, ld0, pquo); ret = std::tr1::rint(d0); fret = std::tr1::rintf(f0); -- 2.7.4