diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 27440c746f87f31e2e30e6283405aa1661d64134..89b8ebb6a4e14971fa8d4006f815be16f5b23e61 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,19 @@
+2005-11-08 Benjamin Kosnik <bkoz@redhat.com>
+
+ * 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 <pcarlini@suse.de>
PR libstdc++/18174
@@ -120,8 +136,9 @@
2005-10-17 Jonathan Wakely <redi@gcc.gnu.org>
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 <pcarlini@suse.de>
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index accbe0acc07226e5ee30a60a1686fbaa21cd5c4d..c4d31d93a13035d44cbb5ae27a4760bb4400bb9e 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 bcd9c511922531b2f5b13d0035f11a5c26084d38..fb830d4a103ec005c53cc2b6a22ce73f0d4ff53f 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 8d1d8064ef98fc8f0931ee4a40a2fd3ce0e3c838..3e2ce2c5581bfc6a4f5691b4072f18aba808a9f2 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 <stdexcept>
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 392072f175c5e5cc44e36b4b379e67db584560b8..6f70002bcd46e37bcaa51c602352a3a1efdada79 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 1f4ec3ff1e009c9a79d9b60463865b9ccb355fe6..7f1e7159b4dcc6733efe2c1fcc0df833a9d039ba 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<size_t>(__id);
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 3c5397bc5ae1873f6dd957f22f300486f9498b90..0f10e6dff917b7aaf6f1ab296f73675225e74358 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 <string>"