From 797308b2d1aefbc888c2bfc67b19770ca71fcd19 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 8 Nov 2005 23:07:02 +0000 Subject: [PATCH] libstdc++.exp (check_v3_target_debug_mode): Use exe as the executable extension. 2005-11-08 Benjamin Kosnik * testsuite/lib/libstdc++.exp (check_v3_target_debug_mode): Use exe as the executable extension. * acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Change gnu defaults to new. (GLIBCXX_ENABLE_PCH): Adjust message order. * configure: Regenerate. * scripts/testsuite_flags.in (query): Correct print_usagex typo. * include/bits/functexcept.h: Remove argument names. * src/mt_allocator.cc: Adjust comment. From-SVN: r106665 --- libstdc++-v3/ChangeLog | 21 +++++++++++++++++++-- libstdc++-v3/acinclude.m4 | 8 ++++---- libstdc++-v3/configure | 12 ++++++------ libstdc++-v3/include/bits/functexcept.h | 20 ++++++++++---------- libstdc++-v3/scripts/testsuite_flags.in | 2 +- libstdc++-v3/src/mt_allocator.cc | 2 +- libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 7 files changed, 42 insertions(+), 25 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 27440c746f8..89b8ebb6a4e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2005-11-08 Benjamin Kosnik + + * testsuite/lib/libstdc++.exp (check_v3_target_debug_mode): Use + exe as the executable extension. + + * acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Change gnu defaults to + new. + (GLIBCXX_ENABLE_PCH): Adjust message order. + * configure: Regenerate. + + * scripts/testsuite_flags.in (query): Correct print_usagex typo. + + * include/bits/functexcept.h: Remove argument names. + + * src/mt_allocator.cc: Adjust comment. + 2005-11-06 Paolo Carlini PR libstdc++/18174 @@ -120,8 +136,9 @@ 2005-10-17 Jonathan Wakely PR libstdc++/24244 - * include/tr1/boost_shared_ptr.h (_Sp_counted_base::_Sp_counted_base()): - When __GTHREAD_MUTEX_INIT is defined, initialize the mutex. + * include/tr1/boost_shared_ptr.h + (_Sp_counted_base::_Sp_counted_base()): When __GTHREAD_MUTEX_INIT + is defined, initialize the mutex. 2005-10-15 Paolo Carlini diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index accbe0acc07..c4d31d93a13 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1280,7 +1280,7 @@ AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [ if test $enable_libstdcxx_allocator_flag = auto; then case ${target_os} in linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) - enable_libstdcxx_allocator_flag=mt + enable_libstdcxx_allocator_flag=new ;; *) enable_libstdcxx_allocator_flag=new @@ -1558,10 +1558,7 @@ dnl Substs: dnl glibcxx_PCHFLAGS dnl AC_DEFUN([GLIBCXX_ENABLE_PCH], [ - AC_MSG_CHECKING([for enabled PCH]) GLIBCXX_ENABLE(libstdcxx-pch,$1,,[build pre-compiled libstdc++ headers]) - AC_MSG_RESULT([$enable_libstdcxx_pch]) - if test $enable_libstdcxx_pch = yes; then AC_CACHE_CHECK([for compiler with PCH support], [glibcxx_cv_prog_CXX_pch], @@ -1587,6 +1584,9 @@ AC_DEFUN([GLIBCXX_ENABLE_PCH], [ enable_libstdcxx_pch=$glibcxx_cv_prog_CXX_pch fi + AC_MSG_CHECKING([for enabled PCH]) + AC_MSG_RESULT([$enable_libstdcxx_pch]) + GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_PCH, test $enable_libstdcxx_pch = yes) if test $enable_libstdcxx_pch = yes; then glibcxx_PCHFLAGS="-include bits/stdc++.h" diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index bcd9c511922..fb830d4a103 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -5134,8 +5134,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "${ECHO_T}$ac_exception_model_name" >&6 - echo "$as_me:$LINENO: checking for enabled PCH" >&5 -echo $ECHO_N "checking for enabled PCH... $ECHO_C" >&6 # Check whether --enable-libstdcxx-pch or --disable-libstdcxx-pch was given. if test "${enable_libstdcxx_pch+set}" = set; then enableval="$enable_libstdcxx_pch" @@ -5151,9 +5149,6 @@ else enable_libstdcxx_pch=$is_hosted fi; - echo "$as_me:$LINENO: result: $enable_libstdcxx_pch" >&5 -echo "${ECHO_T}$enable_libstdcxx_pch" >&6 - if test $enable_libstdcxx_pch = yes; then echo "$as_me:$LINENO: checking for compiler with PCH support" >&5 echo $ECHO_N "checking for compiler with PCH support... $ECHO_C" >&6 @@ -5196,6 +5191,11 @@ echo "${ECHO_T}$glibcxx_cv_prog_CXX_pch" >&6 enable_libstdcxx_pch=$glibcxx_cv_prog_CXX_pch fi + echo "$as_me:$LINENO: checking for enabled PCH" >&5 +echo $ECHO_N "checking for enabled PCH... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $enable_libstdcxx_pch" >&5 +echo "${ECHO_T}$enable_libstdcxx_pch" >&6 + if test $enable_libstdcxx_pch = yes; then glibcxx_PCHFLAGS="-include bits/stdc++.h" @@ -6352,7 +6352,7 @@ fi; if test $enable_libstdcxx_allocator_flag = auto; then case ${target_os} in linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) - enable_libstdcxx_allocator_flag=mt + enable_libstdcxx_allocator_flag=new ;; *) enable_libstdcxx_allocator_flag=new diff --git a/libstdc++-v3/include/bits/functexcept.h b/libstdc++-v3/include/bits/functexcept.h index 8d1d8064ef9..3e2ce2c5581 100644 --- a/libstdc++-v3/include/bits/functexcept.h +++ b/libstdc++-v3/include/bits/functexcept.h @@ -59,35 +59,35 @@ namespace std // Helpers for exception objects in void - __throw_logic_error(const char* __s) __attribute__((__noreturn__)); + __throw_logic_error(const char*) __attribute__((__noreturn__)); void - __throw_domain_error(const char* __s) __attribute__((__noreturn__)); + __throw_domain_error(const char*) __attribute__((__noreturn__)); void - __throw_invalid_argument(const char* __s) __attribute__((__noreturn__)); + __throw_invalid_argument(const char*) __attribute__((__noreturn__)); void - __throw_length_error(const char* __s) __attribute__((__noreturn__)); + __throw_length_error(const char*) __attribute__((__noreturn__)); void - __throw_out_of_range(const char* __s) __attribute__((__noreturn__)); + __throw_out_of_range(const char*) __attribute__((__noreturn__)); void - __throw_runtime_error(const char* __s) __attribute__((__noreturn__)); + __throw_runtime_error(const char*) __attribute__((__noreturn__)); void - __throw_range_error(const char* __s) __attribute__((__noreturn__)); + __throw_range_error(const char*) __attribute__((__noreturn__)); void - __throw_overflow_error(const char* __s) __attribute__((__noreturn__)); + __throw_overflow_error(const char*) __attribute__((__noreturn__)); void - __throw_underflow_error(const char* __s) __attribute__((__noreturn__)); + __throw_underflow_error(const char*) __attribute__((__noreturn__)); // Helpers for exception objects in basic_ios void - __throw_ios_failure(const char* __s) __attribute__((__noreturn__)); + __throw_ios_failure(const char*) __attribute__((__noreturn__)); } // namespace std #endif diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index 392072f175c..6f70002bcd4 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -57,7 +57,7 @@ case ${query} in echo ${PCHFLAGS} ;; *) - print_usagex + print_usage ;; esac diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc index 1f4ec3ff1e0..7f1e7159b4d 100644 --- a/libstdc++-v3/src/mt_allocator.cc +++ b/libstdc++-v3/src/mt_allocator.cc @@ -63,7 +63,7 @@ namespace __gnu_internal static void _M_destroy_thread_key(void* __id) { - // Return this thread id record to front of thread_freelist. + // Return this thread id record to the front of thread_freelist. __gnu_cxx::lock sentry(__gnu_internal::freelist_mutex); size_t _M_id = reinterpret_cast(__id); diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 3c5397bc5ae..0f10e6dff91 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -611,7 +611,7 @@ proc check_v3_target_debug_mode { } { # on correct ordering of static object destructors. This is # indicative of the presence and use of __cxa_atexit. set src debug_mode[pid].cc - set exe debug_mode[pid].x + set exe debug_mode[pid].exe set f [open $src "w"] puts $f "#include "