From 118c8424411e7a9a250bdf7ea7ac1975ffe31477 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo@gcc.gnu.org>
Date: Wed, 12 Oct 2016 16:13:06 +0000
Subject: [PATCH] testsuite_hooks.h: Rewrite VERIFY in terms of
 __builtin_printf and __builtin_abort.

2016-10-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/util/testsuite_hooks.h: Rewrite VERIFY in terms of
	__builtin_printf and __builtin_abort.
	* testsuite/lib/libstdc++.exp: Remove _GLIBCXX_ASSERT use.
	* scripts/testsuite_flags.in: Likewise.
	* testsuite/22_locale/time_get/get/char/1.cc: Likewise.
	* testsuite/22_locale/time_get/get/char/2.cc: Likewise.
	* testsuite/22_locale/time_get/get/wchar_t/1.cc: Likewise.
	* testsuite/22_locale/time_get/get/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/4879.cc: Likewise, adjust.
	* testsuite/27_io/basic_filebuf/close/char/9964.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/26777.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/10097.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc:
	Likewise.
	* testsuite/27_io/objects/char/7.cc: Likewise.
	* testsuite/27_io/objects/char/9661-1.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/7.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/9661-1.cc: Likewise.
	* testsuite/18_support/50594.cc: Remove 'test' variable, adjust.
	* testsuite/18_support/bad_alloc/what.cc: Likewise.
	* testsuite/18_support/bad_cast/what.cc: Likewise.
	* testsuite/18_support/bad_exception/what.cc: Likewise.
	* testsuite/18_support/bad_typeid/what.cc: Likewise.
	* testsuite/18_support/exception/38732.cc: Likewise.
	* testsuite/18_support/exception/what.cc: Likewise.
	* testsuite/18_support/exception_ptr/64241.cc: Likewise.
	* testsuite/18_support/exception_ptr/current_exception.cc: Likewise.
	* testsuite/18_support/exception_ptr/lifespan.cc: Likewise.
	* testsuite/18_support/exception_ptr/make_exception_ptr.cc: Likewise.
	* testsuite/18_support/exception_ptr/rethrow_exception.cc: Likewise.
	* testsuite/18_support/nested_exception/cons.cc: Likewise.
	* testsuite/18_support/nested_exception/nested_ptr.cc: Likewise.
	* testsuite/18_support/nested_exception/rethrow_if_nested.cc: Likewise.
	* testsuite/18_support/nested_exception/rethrow_nested.cc: Likewise.
	* testsuite/18_support/nested_exception/throw_with_nested.cc: Likewise.
	* testsuite/18_support/numeric_limits/char16_32_t.cc: Likewise.
	* testsuite/18_support/numeric_limits/digits10.cc: Likewise.
	* testsuite/18_support/numeric_limits/dr559.cc: Likewise.
	* testsuite/18_support/numeric_limits/epsilon.cc: Likewise.
	* testsuite/18_support/numeric_limits/is_iec559.cc: Likewise.
	* testsuite/18_support/numeric_limits/is_signed.cc: Likewise.
	* testsuite/18_support/numeric_limits/lowest.cc: Likewise.
	* testsuite/18_support/numeric_limits/max_digits10.cc: Likewise.
	* testsuite/18_support/numeric_limits/min_max.cc: Likewise.
	* testsuite/18_support/numeric_limits/specialization_default_values.cc:
	Likewise.
	* testsuite/18_support/type_info/hash_code.cc: Likewise.
	* testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Likewise.
	* testsuite/19_diagnostics/error_category/cons/default.cc: Likewise.
	* testsuite/19_diagnostics/error_category/operators/equal.cc: Likewise.
	* testsuite/19_diagnostics/error_category/operators/
	not_equal.cc: Likewise.
	* testsuite/19_diagnostics/error_code/cons/1.cc: Likewise.
	* testsuite/19_diagnostics/error_code/cons/39882.cc: Likewise.
	* testsuite/19_diagnostics/error_code/modifiers/39882.cc: Likewise.
	* testsuite/19_diagnostics/error_code/operators/bool.cc: Likewise.
	* testsuite/19_diagnostics/error_code/operators/equal.cc: Likewise.
	* testsuite/19_diagnostics/error_code/operators/not_equal.cc: Likewise.
	* testsuite/19_diagnostics/error_condition/cons/1.cc: Likewise.
	* testsuite/19_diagnostics/error_condition/cons/39881.cc: Likewise.
	* testsuite/19_diagnostics/error_condition/modifiers/39881.cc:
	Likewise.
	* testsuite/19_diagnostics/error_condition/operators/bool.cc: Likewise.
	* testsuite/19_diagnostics/error_condition/operators/equal.cc:
	Likewise.
	* testsuite/19_diagnostics/error_condition/operators/not_equal.cc:
	Likewise.
	* testsuite/19_diagnostics/logic_error/what-1.cc: Likewise.
	* testsuite/19_diagnostics/logic_error/what-2.cc: Likewise.
	* testsuite/19_diagnostics/logic_error/what-3.cc: Likewise.
	* testsuite/19_diagnostics/logic_error/what-big.cc: Likewise.
	* testsuite/19_diagnostics/runtime_error/what-1.cc: Likewise.
	* testsuite/19_diagnostics/runtime_error/what-2.cc: Likewise.
	* testsuite/19_diagnostics/runtime_error/what-3.cc: Likewise.
	* testsuite/19_diagnostics/runtime_error/what-big.cc: Likewise.
	* testsuite/19_diagnostics/system_error/cons-1.cc: Likewise.
	* testsuite/19_diagnostics/system_error/what-1.cc: Likewise.
	* testsuite/19_diagnostics/system_error/what-2.cc: Likewise.
	* testsuite/19_diagnostics/system_error/what-3.cc: Likewise.
	* testsuite/19_diagnostics/system_error/what-4.cc: Likewise.
	* testsuite/19_diagnostics/system_error/what-big.cc: Likewise.
	* testsuite/20_util/addressof/1.cc: Likewise.
	* testsuite/20_util/align/1.cc: Likewise.
	* testsuite/20_util/align/2.cc: Likewise.
	* testsuite/20_util/allocator/1.cc: Likewise.
	* testsuite/20_util/allocator/10378.cc: Likewise.
	* testsuite/20_util/allocator/8230.cc: Likewise.
	* testsuite/20_util/allocator_traits/members/allocate_hint.cc:
	Likewise.
	* testsuite/20_util/allocator_traits/members/construct.cc: Likewise.
	* testsuite/20_util/allocator_traits/members/destroy.cc: Likewise.
	* testsuite/20_util/allocator_traits/members/max_size.cc: Likewise.
	* testsuite/20_util/any/assign/exception.cc: Likewise.
	* testsuite/20_util/auto_ptr/1.cc: Likewise.
	* testsuite/20_util/auto_ptr/2.cc: Likewise.
	* testsuite/20_util/auto_ptr/3.cc: Likewise.
	* testsuite/20_util/auto_ptr/4.cc: Likewise.
	* testsuite/20_util/auto_ptr/5.cc: Likewise.
	* testsuite/20_util/auto_ptr/6.cc: Likewise.
	* testsuite/20_util/auto_ptr/7.cc: Likewise.
	* testsuite/20_util/bind/all_bound.cc: Likewise.
	* testsuite/20_util/bind/conv_result.cc: Likewise.
	* testsuite/20_util/bind/cv_quals.cc: Likewise.
	* testsuite/20_util/bind/cv_quals_2.cc
	* testsuite/20_util/bind/nested.cc: Likewise.
	* testsuite/20_util/bind/placeholders.cc: Likewise.
	* testsuite/20_util/bind/ref.cc: Likewise.
	* testsuite/20_util/bind/ref2.cc: Likewise.
	* testsuite/20_util/common_type/requirements/typedefs-1.cc: Likewise.
	* testsuite/20_util/duration/arithmetic/1.cc: Likewise.
	* testsuite/20_util/duration/arithmetic/2.cc: Likewise.
	* testsuite/20_util/duration/arithmetic/58850.cc: Likewise.
	* testsuite/20_util/duration/arithmetic/dr2020.cc: Likewise.
	* testsuite/20_util/duration/arithmetic/dr934-2.cc: Likewise.
	* testsuite/20_util/duration/comparison_operators/1.cc: Likewise.
	* testsuite/20_util/duration/cons/1.cc: Likewise.
	* testsuite/20_util/duration/cons/2.cc: Likewise.
	* testsuite/20_util/enable_if/requirements/typedefs.cc: Likewise.
	* testsuite/20_util/enable_if/requirements/typedefs_neg.cc: Likewise.
	* testsuite/20_util/enable_shared_from_this/members/assign.cc:
	Likewise.
	* testsuite/20_util/exchange/1.cc: Likewise.
	* testsuite/20_util/forward/a.cc: Likewise.
	* testsuite/20_util/forward/b.cc: Likewise.
	* testsuite/20_util/forward/d.cc: Likewise.
	* testsuite/20_util/function/1.cc: Likewise.
	* testsuite/20_util/function/2.cc: Likewise.
	* testsuite/20_util/function/3.cc: Likewise.
	* testsuite/20_util/function/4.cc: Likewise.
	* testsuite/20_util/function/43397.cc: Likewise.
	* testsuite/20_util/function/5.cc: Likewise.
	* testsuite/20_util/function/6.cc: Likewise.
	* testsuite/20_util/function/7.cc: Likewise.
	* testsuite/20_util/function/8.cc: Likewise.
	* testsuite/20_util/function/9.cc: Likewise.
	* testsuite/20_util/function/assign/move.cc: Likewise.
	* testsuite/20_util/function/cons/move.cc: Likewise.
	* testsuite/20_util/function_objects/dr660.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_bit_flip_set.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_bit_string_set.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_document_words.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc: Likewise.
	* testsuite/20_util/hash/chi2_q_uniform_random.cc: Likewise.
	* testsuite/20_util/hash/operators/size_t.cc: Likewise.
	* testsuite/20_util/hash/quality.cc: Likewise.
	* testsuite/20_util/integral_constant/static_definition.cc: Likewise.
	* testsuite/20_util/integral_constant/true_false_value.cc: Likewise.
	* testsuite/20_util/is_function/24808.cc: Likewise.
	* testsuite/20_util/is_object/24808.cc: Likewise.
	* testsuite/20_util/move_if_noexcept/1.cc: Likewise.
	* testsuite/20_util/move_if_noexcept/constexpr.cc: Likewise.
	* testsuite/20_util/owner_less/cmp.cc: Likewise.
	* testsuite/20_util/pair/1.cc: Likewise.
	* testsuite/20_util/pair/2.cc: Likewise.
	* testsuite/20_util/pair/3.cc: Likewise.
	* testsuite/20_util/pair/4.cc: Likewise.
	* testsuite/20_util/pair/make_pair/constexpr.cc: Likewise.
	* testsuite/20_util/pair/moveable.cc: Likewise.
	* testsuite/20_util/pair/piecewise.cc: Likewise.
	* testsuite/20_util/pair/swap.cc: Likewise.
	* testsuite/20_util/ratio/comparisons/comp1.cc: Likewise.
	* testsuite/20_util/ratio/comparisons/comp2.cc: Likewise.
	* testsuite/20_util/ratio/comparisons/comp3.cc: Likewise.
	* testsuite/20_util/ratio/cons/cons1.cc: Likewise.
	* testsuite/20_util/ratio/operations/45866.cc: Likewise.
	* testsuite/20_util/ratio/operations/47913.cc: Likewise.
	* testsuite/20_util/ratio/operations/ops1.cc: Likewise.
	* testsuite/20_util/ratio/operations/ops2.cc: Likewise.
	* testsuite/20_util/ratio/operations/ops3.cc: Likewise.
	* testsuite/20_util/reference_wrapper/invoke.cc: Likewise.
	* testsuite/20_util/scoped_allocator/1.cc: Likewise.
	* testsuite/20_util/scoped_allocator/2.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/assign.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/auto_ptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/move.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/shared_ptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc:
	Likewise.
	* testsuite/20_util/shared_ptr/comparison/cmp.cc: Likewise.
	* testsuite/20_util/shared_ptr/comparison/less.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/alias.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/alloc.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/auto_ptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/copy.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/default.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/move.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/nullptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/pointer.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_array.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc:
	Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_2.cc:
	Likewise.
	* testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/cons/weak_ptr.cc: Likewise.
	* testsuite/20_util/shared_ptr/creation/alloc.cc: Likewise.
	* testsuite/20_util/shared_ptr/creation/dr402.cc: Likewise.
	* testsuite/20_util/shared_ptr/creation/dr925.cc: Likewise.
	* testsuite/20_util/shared_ptr/creation/make.cc: Likewise.
	* testsuite/20_util/shared_ptr/dest/dest.cc: Likewise.
	* testsuite/20_util/shared_ptr/hash/1.cc: Likewise.
	* testsuite/20_util/shared_ptr/misc/24595.cc: Likewise.
	* testsuite/20_util/shared_ptr/misc/42019.cc: Likewise.
	* testsuite/20_util/shared_ptr/misc/io.cc: Likewise.
	* testsuite/20_util/shared_ptr/misc/swap.cc: Likewise.
	* testsuite/20_util/shared_ptr/modifiers/reset.cc: Likewise.
	* testsuite/20_util/shared_ptr/modifiers/reset_alloc.cc: Likewise.
	* testsuite/20_util/shared_ptr/modifiers/reset_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/modifiers/swap.cc: Likewise.
	* testsuite/20_util/shared_ptr/modifiers/swap_neg.cc: Likewise.
	* testsuite/20_util/shared_ptr/observers/bool_conv.cc: Likewise.
	* testsuite/20_util/shared_ptr/observers/get.cc: Likewise.
	* testsuite/20_util/shared_ptr/observers/owner_before.cc: Likewise.
	* testsuite/20_util/shared_ptr/observers/unique.cc: Likewise.
	* testsuite/20_util/shared_ptr/observers/use_count.cc: Likewise.
	* testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc:
	Likewise.
	* testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise.
	* testsuite/20_util/specialized_algorithms/uninitialized_copy/
	move_iterators/1.cc: Likewise.
	* testsuite/20_util/specialized_algorithms/uninitialized_copy_n/
	move_iterators/1.cc: Likewise.
	* testsuite/20_util/temporary_buffer.cc: Likewise.
	* testsuite/20_util/time_point/1.cc: Likewise.
	* testsuite/20_util/time_point/2.cc: Likewise.
	* testsuite/20_util/time_point/3.cc: Likewise.
	* testsuite/20_util/time_point/nonmember/constexpr.cc: Likewise.
	* testsuite/20_util/tuple/48476.cc: Likewise.
	* testsuite/20_util/tuple/comparison_operators/comparisons.cc:
	Likewise.
	* testsuite/20_util/tuple/cons/allocators.cc: Likewise.
	* testsuite/20_util/tuple/cons/assignment.cc: Likewise.
	* testsuite/20_util/tuple/cons/big_tuples.cc: Likewise.
	* testsuite/20_util/tuple/cons/constructor.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/23978.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/48476.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/constexpr.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/forward_as_tuple.cc:
	Likewise.
	* testsuite/20_util/tuple/creation_functions/make_tuple.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/tie.cc: Likewise.
	* testsuite/20_util/tuple/creation_functions/tie2.cc: Likewise.
	* testsuite/20_util/tuple/cv_tuple_size.cc: Likewise.
	* testsuite/20_util/tuple/element_access/get.cc: Likewise.
	* testsuite/20_util/tuple/element_access/get_by_type.cc: Likewise.
	* testsuite/20_util/tuple/moveable.cc: Likewise.
	* testsuite/20_util/tuple/swap.cc: Likewise.
	* testsuite/20_util/tuple/tuple_size.cc: Likewise.
	* testsuite/20_util/typeindex/comparison_operators.cc: Likewise.
	* testsuite/20_util/typeindex/hash.cc: Likewise.
	* testsuite/20_util/typeindex/hash_code.cc: Likewise.
	* testsuite/20_util/typeindex/name.cc: Likewise.
	* testsuite/20_util/unique_ptr/assign/48635.cc: Likewise.
	* testsuite/20_util/unique_ptr/assign/move.cc: Likewise.
	* testsuite/20_util/unique_ptr/assign/move_array.cc: Likewise.
	* testsuite/20_util/unique_ptr/assign/nullptr.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/auto_ptr.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/nullptr.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/pointer.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/pointer_array.cc: Likewise.
	* testsuite/20_util/unique_ptr/cons/ptr_deleter.cc: Likewise.
	* testsuite/20_util/unique_ptr/creation/array.cc: Likewise.
	* testsuite/20_util/unique_ptr/creation/single.cc: Likewise.
	* testsuite/20_util/unique_ptr/hash/1.cc: Likewise.
	* testsuite/20_util/unique_ptr/modifiers/43183.cc: Likewise.
	* testsuite/20_util/unique_ptr/specialized_algorithms/
	comparisons.cc: Likewise.
	* testsuite/20_util/unique_ptr/specialized_algorithms/
	comparisons_array.cc: Likewise.
	* testsuite/20_util/unique_ptr/specialized_algorithms/swap.cc:
	Likewise.
	* testsuite/20_util/uses_allocator/construction.cc: Likewise.
	* testsuite/20_util/uses_allocator/value.cc: Likewise.
	* testsuite/20_util/variant/run.cc: Likewise.
	* testsuite/20_util/weak_ptr/observers/owner_before.cc: Likewise.
	* testsuite/21_strings/basic_string/allocator/char/copy.cc: Likewise.
	* testsuite/21_strings/basic_string/allocator/char/copy_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/char/move.cc: Likewise.
	* testsuite/21_strings/basic_string/allocator/char/move_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/char/swap.cc: Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/move.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc:
	Likewise.
	* testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc:
	Likewise.
	* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/char/18654.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc:
	Likewise.
	* testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc:
	Likewise.
	* testsuite/21_strings/basic_string/capacity/wchar_t/2.cc: Likewise.
	* testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc:
	Likewise.
	* testsuite/21_strings/basic_string/cons/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/3.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/4.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/42261.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/5.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/6.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/7.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/8.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/moveable.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/char/moveable2.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/2.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/3.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/4.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/42261.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/5.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/6.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/7.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/8.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc: Likewise.
	* testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string/element_access/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string/element_access/char/3.cc: Likewise.
	* testsuite/21_strings/basic_string/element_access/char/4.cc: Likewise.
	* testsuite/21_strings/basic_string/element_access/char/58163.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/char/empty.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/char/front_back.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/58163.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/empty.cc:
	Likewise.
	* testsuite/21_strings/basic_string/element_access/wchar_t/
	front_back.cc: Likewise.
	* testsuite/21_strings/basic_string/init-list.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/10.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/11.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/
	28277.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/6.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/7.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/8.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/char/9.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/pod/
	10081-in.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/pod/
	10081-out.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/
	10.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/
	11.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/
	28277.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/6.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/7.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/8.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/9.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/append/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/char/
	move_assign.cc: Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/assign/wchar_t/
	move_assign.cc: Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/insert/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/6.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/char/7.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/6.cc:
	Likewise.
	* testsuite/21_strings/basic_string/modifiers/replace/wchar_t/7.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/
	stoull.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/
	to_string.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	dr1261.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stod.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stof.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoi.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stol.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stold.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoll.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoul.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoull.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	to_wstring.cc: Likewise.
	* testsuite/21_strings/basic_string/operations/compare/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/compare/char/13650.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/compare/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/compare/wchar_t/
	13650.cc: Likewise.
	* testsuite/21_strings/basic_string/operations/compare/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/data/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/char/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/find/wchar_t/5.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/substr/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string/operations/substr/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/char/3.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/char/4.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/char/5.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/2.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/3.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/4.cc: Likewise.
	* testsuite/21_strings/basic_string/operators/wchar_t/5.cc: Likewise.
	* testsuite/21_strings/basic_string_view/capacity/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/char/3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/wchar_t/2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/cons/wchar_t/3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/char/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/char/
	empty.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/char/
	front_back.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/wchar_t/
	empty.cc: Likewise.
	* testsuite/21_strings/basic_string_view/element_access/wchar_t/
	front_back.cc: Likewise.
	* testsuite/21_strings/basic_string_view/inserters/char/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/inserters/char/2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/inserters/char/3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/inserters/pod/10081-out.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/inserters/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/inserters/wchar_t/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/
	char/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/modifiers/remove_prefix/
	wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/
	char/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/modifiers/remove_suffix/
	wchar_t/1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/compare/char/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/compare/char/
	13650.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/compare/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/compare/wchar_t/
	13650.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/copy/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/data/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/char/1.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/char/3.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/char/4.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/wchar_t/
	2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/wchar_t/
	3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/find/wchar_t/
	4.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/char/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/char/
	2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/char/
	3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/
	2.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/
	3.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/string_conversion/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/substr/char/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operations/substr/wchar_t/
	1.cc: Likewise.
	* testsuite/21_strings/basic_string_view/operators/char/2.cc:
	Likewise.
	* testsuite/21_strings/basic_string_view/operators/wchar_t/2.cc:
	Likewise.
	* testsuite/21_strings/c_strings/char/1.cc: Likewise.
	* testsuite/21_strings/c_strings/wchar_t/1.cc: Likewise.
	* testsuite/21_strings/char_traits/requirements/char/1.cc: Likewise.
	* testsuite/21_strings/char_traits/requirements/char/57704.cc:
	Likewise.
	* testsuite/21_strings/char_traits/requirements/short/1.cc: Likewise.
	* testsuite/21_strings/char_traits/requirements/wchar_t/1.cc: Likewise.

	* doc/xml/manual/test.xml: Fix typo.

From-SVN: r241069
---
 libstdc++-v3/doc/xml/manual/test.xml               |  2 +-
 libstdc++-v3/scripts/testsuite_flags.in            |  2 +-
 libstdc++-v3/testsuite/18_support/50594.cc         |  2 --
 .../testsuite/18_support/bad_alloc/what.cc         |  1 -
 libstdc++-v3/testsuite/18_support/bad_cast/what.cc |  1 -
 .../testsuite/18_support/bad_exception/what.cc     |  1 -
 .../testsuite/18_support/bad_typeid/what.cc        |  1 -
 .../testsuite/18_support/exception/38732.cc        |  1 -
 .../testsuite/18_support/exception/what.cc         |  1 -
 .../testsuite/18_support/exception_ptr/64241.cc    |  2 +-
 .../18_support/exception_ptr/current_exception.cc  |  4 ---
 .../testsuite/18_support/exception_ptr/lifespan.cc |  7 -----
 .../18_support/exception_ptr/make_exception_ptr.cc |  2 --
 .../18_support/exception_ptr/rethrow_exception.cc  |  1 -
 .../testsuite/18_support/nested_exception/cons.cc  |  4 ---
 .../18_support/nested_exception/nested_ptr.cc      |  4 ---
 .../nested_exception/rethrow_if_nested.cc          |  6 ++--
 .../18_support/nested_exception/rethrow_nested.cc  |  2 +-
 .../nested_exception/throw_with_nested.cc          |  6 ++--
 .../18_support/numeric_limits/char16_32_t.cc       |  2 --
 .../18_support/numeric_limits/digits10.cc          |  5 +--
 .../testsuite/18_support/numeric_limits/dr559.cc   |  1 -
 .../testsuite/18_support/numeric_limits/epsilon.cc |  1 -
 .../18_support/numeric_limits/is_iec559.cc         |  5 +--
 .../18_support/numeric_limits/is_signed.cc         |  1 -
 .../testsuite/18_support/numeric_limits/lowest.cc  |  2 --
 .../18_support/numeric_limits/max_digits10.cc      |  2 --
 .../testsuite/18_support/numeric_limits/min_max.cc |  1 -
 .../specialization_default_values.cc               |  4 +--
 .../testsuite/18_support/type_info/hash_code.cc    |  1 -
 .../19_diagnostics/error_category/cons/copy_neg.cc |  2 --
 .../19_diagnostics/error_category/cons/default.cc  |  2 --
 .../error_category/operators/equal.cc              |  2 --
 .../error_category/operators/not_equal.cc          |  2 --
 .../testsuite/19_diagnostics/error_code/cons/1.cc  |  2 --
 .../19_diagnostics/error_code/cons/39882.cc        |  2 --
 .../19_diagnostics/error_code/modifiers/39882.cc   |  2 --
 .../19_diagnostics/error_code/operators/bool.cc    |  2 --
 .../19_diagnostics/error_code/operators/equal.cc   |  2 --
 .../error_code/operators/not_equal.cc              |  2 --
 .../19_diagnostics/error_condition/cons/1.cc       |  2 --
 .../19_diagnostics/error_condition/cons/39881.cc   |  2 --
 .../error_condition/modifiers/39881.cc             |  2 --
 .../error_condition/operators/bool.cc              |  2 --
 .../error_condition/operators/equal.cc             |  2 --
 .../error_condition/operators/not_equal.cc         |  2 --
 .../testsuite/19_diagnostics/logic_error/what-1.cc |  2 --
 .../testsuite/19_diagnostics/logic_error/what-2.cc |  1 -
 .../testsuite/19_diagnostics/logic_error/what-3.cc |  1 -
 .../19_diagnostics/logic_error/what-big.cc         |  1 -
 .../19_diagnostics/runtime_error/what-1.cc         |  2 --
 .../19_diagnostics/runtime_error/what-2.cc         |  1 -
 .../19_diagnostics/runtime_error/what-3.cc         |  1 -
 .../19_diagnostics/runtime_error/what-big.cc       |  1 -
 .../19_diagnostics/system_error/cons-1.cc          |  1 -
 .../19_diagnostics/system_error/what-1.cc          |  2 --
 .../19_diagnostics/system_error/what-2.cc          |  1 -
 .../19_diagnostics/system_error/what-3.cc          |  1 -
 .../19_diagnostics/system_error/what-4.cc          |  1 -
 .../19_diagnostics/system_error/what-big.cc        |  1 -
 libstdc++-v3/testsuite/20_util/addressof/1.cc      |  1 -
 libstdc++-v3/testsuite/20_util/align/1.cc          |  2 --
 libstdc++-v3/testsuite/20_util/align/2.cc          |  2 --
 libstdc++-v3/testsuite/20_util/allocator/1.cc      |  1 -
 libstdc++-v3/testsuite/20_util/allocator/10378.cc  |  1 -
 libstdc++-v3/testsuite/20_util/allocator/8230.cc   |  2 +-
 .../allocator_traits/members/allocate_hint.cc      |  4 ---
 .../20_util/allocator_traits/members/construct.cc  |  2 --
 .../20_util/allocator_traits/members/destroy.cc    |  4 ---
 .../20_util/allocator_traits/members/max_size.cc   |  6 ----
 .../testsuite/20_util/any/assign/exception.cc      |  8 ++---
 libstdc++-v3/testsuite/20_util/auto_ptr/1.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/2.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/3.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/4.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/5.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/6.cc       |  1 -
 libstdc++-v3/testsuite/20_util/auto_ptr/7.cc       |  1 -
 libstdc++-v3/testsuite/20_util/bind/all_bound.cc   |  2 --
 libstdc++-v3/testsuite/20_util/bind/conv_result.cc |  1 -
 libstdc++-v3/testsuite/20_util/bind/cv_quals.cc    |  8 -----
 libstdc++-v3/testsuite/20_util/bind/cv_quals_2.cc  |  2 --
 libstdc++-v3/testsuite/20_util/bind/nested.cc      |  1 -
 .../testsuite/20_util/bind/placeholders.cc         |  1 -
 libstdc++-v3/testsuite/20_util/bind/ref.cc         |  1 -
 libstdc++-v3/testsuite/20_util/bind/ref2.cc        |  4 ---
 .../20_util/common_type/requirements/typedefs-1.cc |  2 --
 .../testsuite/20_util/duration/arithmetic/1.cc     |  2 --
 .../testsuite/20_util/duration/arithmetic/2.cc     |  1 -
 .../testsuite/20_util/duration/arithmetic/58850.cc |  1 -
 .../20_util/duration/arithmetic/dr2020.cc          |  1 -
 .../20_util/duration/arithmetic/dr934-2.cc         |  1 -
 .../20_util/duration/comparison_operators/1.cc     |  1 -
 libstdc++-v3/testsuite/20_util/duration/cons/1.cc  |  1 -
 libstdc++-v3/testsuite/20_util/duration/cons/2.cc  |  1 -
 .../20_util/enable_if/requirements/typedefs.cc     |  1 -
 .../20_util/enable_if/requirements/typedefs_neg.cc |  3 +-
 .../enable_shared_from_this/members/assign.cc      |  1 -
 libstdc++-v3/testsuite/20_util/exchange/1.cc       |  4 ---
 libstdc++-v3/testsuite/20_util/forward/a.cc        |  1 -
 libstdc++-v3/testsuite/20_util/forward/b.cc        |  1 -
 libstdc++-v3/testsuite/20_util/forward/d.cc        |  1 -
 libstdc++-v3/testsuite/20_util/function/1.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/2.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/3.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/4.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/43397.cc   |  2 --
 libstdc++-v3/testsuite/20_util/function/5.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/6.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/7.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/8.cc       |  2 --
 libstdc++-v3/testsuite/20_util/function/9.cc       |  2 --
 .../testsuite/20_util/function/assign/move.cc      |  2 --
 .../testsuite/20_util/function/cons/move.cc        |  2 --
 .../testsuite/20_util/function_objects/dr660.cc    |  2 --
 .../testsuite/20_util/hash/chi2_q_bit_flip_set.cc  |  1 -
 .../20_util/hash/chi2_q_bit_string_set.cc          |  1 -
 .../20_util/hash/chi2_q_document_words.cc          |  1 -
 .../20_util/hash/chi2_q_numeric_pattern_set.cc     |  1 -
 .../20_util/hash/chi2_q_uniform_random.cc          |  1 -
 .../testsuite/20_util/hash/operators/size_t.cc     |  2 --
 libstdc++-v3/testsuite/20_util/hash/quality.cc     |  2 --
 .../20_util/integral_constant/static_definition.cc |  1 -
 .../20_util/integral_constant/true_false_value.cc  |  1 -
 .../testsuite/20_util/is_function/24808.cc         |  1 -
 libstdc++-v3/testsuite/20_util/is_object/24808.cc  |  1 -
 .../testsuite/20_util/move_if_noexcept/1.cc        |  2 --
 .../20_util/move_if_noexcept/constexpr.cc          |  2 --
 libstdc++-v3/testsuite/20_util/owner_less/cmp.cc   |  8 -----
 libstdc++-v3/testsuite/20_util/pair/1.cc           |  2 --
 libstdc++-v3/testsuite/20_util/pair/2.cc           |  2 --
 libstdc++-v3/testsuite/20_util/pair/3.cc           |  2 --
 libstdc++-v3/testsuite/20_util/pair/4.cc           |  1 -
 .../testsuite/20_util/pair/make_pair/constexpr.cc  |  1 -
 libstdc++-v3/testsuite/20_util/pair/moveable.cc    |  2 --
 libstdc++-v3/testsuite/20_util/pair/piecewise.cc   |  2 --
 libstdc++-v3/testsuite/20_util/pair/swap.cc        |  1 -
 .../testsuite/20_util/ratio/comparisons/comp1.cc   |  4 ---
 .../testsuite/20_util/ratio/comparisons/comp2.cc   |  2 --
 .../testsuite/20_util/ratio/comparisons/comp3.cc   |  2 --
 libstdc++-v3/testsuite/20_util/ratio/cons/cons1.cc |  2 --
 .../testsuite/20_util/ratio/operations/45866.cc    |  2 --
 .../testsuite/20_util/ratio/operations/47913.cc    |  1 -
 .../testsuite/20_util/ratio/operations/ops1.cc     |  5 ---
 .../testsuite/20_util/ratio/operations/ops2.cc     |  6 +---
 .../testsuite/20_util/ratio/operations/ops3.cc     |  6 +---
 .../testsuite/20_util/reference_wrapper/invoke.cc  |  2 --
 .../testsuite/20_util/scoped_allocator/1.cc        |  4 ---
 .../testsuite/20_util/scoped_allocator/2.cc        |  6 ----
 .../testsuite/20_util/shared_ptr/assign/assign.cc  |  1 -
 .../20_util/shared_ptr/assign/auto_ptr.cc          |  1 -
 .../20_util/shared_ptr/assign/auto_ptr_neg.cc      |  2 --
 .../testsuite/20_util/shared_ptr/assign/move.cc    |  2 --
 .../20_util/shared_ptr/assign/shared_ptr.cc        |  1 -
 .../shared_ptr/assign/unique_ptr_lvalue_neg.cc     |  2 --
 .../testsuite/20_util/shared_ptr/comparison/cmp.cc |  4 ---
 .../20_util/shared_ptr/comparison/less.cc          |  6 ----
 .../testsuite/20_util/shared_ptr/cons/alias.cc     |  6 +---
 .../testsuite/20_util/shared_ptr/cons/alloc.cc     |  2 --
 .../testsuite/20_util/shared_ptr/cons/auto_ptr.cc  |  2 --
 .../testsuite/20_util/shared_ptr/cons/copy.cc      |  4 ---
 .../testsuite/20_util/shared_ptr/cons/default.cc   |  2 --
 .../testsuite/20_util/shared_ptr/cons/move.cc      |  5 ---
 .../testsuite/20_util/shared_ptr/cons/nullptr.cc   |  6 ----
 .../testsuite/20_util/shared_ptr/cons/pointer.cc   |  6 ----
 .../20_util/shared_ptr/cons/unique_ptr.cc          |  2 --
 .../20_util/shared_ptr/cons/unique_ptr_array.cc    |  2 --
 .../20_util/shared_ptr/cons/unique_ptr_deleter.cc  |  4 ---
 .../shared_ptr/cons/unique_ptr_deleter_ref_1.cc    |  2 --
 .../shared_ptr/cons/unique_ptr_deleter_ref_2.cc    |  2 --
 .../20_util/shared_ptr/cons/unique_ptr_neg.cc      |  2 --
 .../testsuite/20_util/shared_ptr/cons/weak_ptr.cc  |  2 --
 .../testsuite/20_util/shared_ptr/creation/alloc.cc |  2 --
 .../testsuite/20_util/shared_ptr/creation/dr402.cc |  7 ++---
 .../testsuite/20_util/shared_ptr/creation/dr925.cc |  2 --
 .../testsuite/20_util/shared_ptr/creation/make.cc  |  2 --
 .../testsuite/20_util/shared_ptr/dest/dest.cc      |  3 --
 .../testsuite/20_util/shared_ptr/hash/1.cc         |  2 --
 .../testsuite/20_util/shared_ptr/misc/24595.cc     |  2 --
 .../testsuite/20_util/shared_ptr/misc/42019.cc     |  4 ---
 .../testsuite/20_util/shared_ptr/misc/io.cc        |  2 --
 .../testsuite/20_util/shared_ptr/misc/swap.cc      |  2 --
 .../20_util/shared_ptr/modifiers/reset.cc          |  6 ----
 .../20_util/shared_ptr/modifiers/reset_alloc.cc    |  1 -
 .../20_util/shared_ptr/modifiers/reset_neg.cc      |  2 --
 .../testsuite/20_util/shared_ptr/modifiers/swap.cc |  2 --
 .../20_util/shared_ptr/modifiers/swap_neg.cc       |  2 --
 .../20_util/shared_ptr/observers/bool_conv.cc      |  6 ----
 .../testsuite/20_util/shared_ptr/observers/get.cc  |  8 -----
 .../20_util/shared_ptr/observers/owner_before.cc   |  6 ----
 .../20_util/shared_ptr/observers/unique.cc         |  6 ----
 .../20_util/shared_ptr/observers/use_count.cc      |  6 ----
 .../shared_ptr/thread/default_weaktoshared.cc      |  1 -
 .../shared_ptr/thread/mutex_weaktoshared.cc        |  1 -
 .../uninitialized_copy/move_iterators/1.cc         |  2 --
 .../uninitialized_copy_n/move_iterators/1.cc       |  2 --
 libstdc++-v3/testsuite/20_util/temporary_buffer.cc |  2 --
 libstdc++-v3/testsuite/20_util/time_point/1.cc     |  1 -
 libstdc++-v3/testsuite/20_util/time_point/2.cc     |  2 --
 libstdc++-v3/testsuite/20_util/time_point/3.cc     |  1 -
 .../20_util/time_point/nonmember/constexpr.cc      |  1 -
 libstdc++-v3/testsuite/20_util/tuple/48476.cc      |  2 --
 .../tuple/comparison_operators/comparisons.cc      |  2 --
 .../testsuite/20_util/tuple/cons/allocators.cc     |  2 --
 .../testsuite/20_util/tuple/cons/assignment.cc     |  2 --
 .../testsuite/20_util/tuple/cons/big_tuples.cc     |  2 --
 .../testsuite/20_util/tuple/cons/constructor.cc    |  2 --
 .../20_util/tuple/creation_functions/23978.cc      |  2 --
 .../20_util/tuple/creation_functions/48476.cc      |  2 --
 .../20_util/tuple/creation_functions/constexpr.cc  |  3 --
 .../tuple/creation_functions/forward_as_tuple.cc   |  2 --
 .../20_util/tuple/creation_functions/make_tuple.cc |  2 --
 .../20_util/tuple/creation_functions/tie.cc        |  2 --
 .../20_util/tuple/creation_functions/tie2.cc       |  1 -
 .../testsuite/20_util/tuple/cv_tuple_size.cc       |  1 -
 .../testsuite/20_util/tuple/element_access/get.cc  |  2 --
 .../20_util/tuple/element_access/get_by_type.cc    |  2 --
 libstdc++-v3/testsuite/20_util/tuple/moveable.cc   |  2 --
 libstdc++-v3/testsuite/20_util/tuple/swap.cc       |  8 -----
 libstdc++-v3/testsuite/20_util/tuple/tuple_size.cc |  2 --
 .../20_util/typeindex/comparison_operators.cc      |  1 -
 libstdc++-v3/testsuite/20_util/typeindex/hash.cc   |  1 -
 .../testsuite/20_util/typeindex/hash_code.cc       |  1 -
 libstdc++-v3/testsuite/20_util/typeindex/name.cc   |  1 -
 .../testsuite/20_util/unique_ptr/assign/48635.cc   |  2 --
 .../testsuite/20_util/unique_ptr/assign/move.cc    |  2 --
 .../20_util/unique_ptr/assign/move_array.cc        |  2 --
 .../testsuite/20_util/unique_ptr/assign/nullptr.cc |  4 ---
 .../testsuite/20_util/unique_ptr/cons/auto_ptr.cc  |  2 --
 .../testsuite/20_util/unique_ptr/cons/nullptr.cc   |  4 ---
 .../testsuite/20_util/unique_ptr/cons/pointer.cc   |  2 --
 .../20_util/unique_ptr/cons/pointer_array.cc       |  1 -
 .../20_util/unique_ptr/cons/ptr_deleter.cc         |  2 --
 .../testsuite/20_util/unique_ptr/creation/array.cc |  2 --
 .../20_util/unique_ptr/creation/single.cc          |  2 --
 .../testsuite/20_util/unique_ptr/hash/1.cc         |  2 --
 .../20_util/unique_ptr/modifiers/43183.cc          |  2 --
 .../specialized_algorithms/comparisons.cc          |  4 ---
 .../specialized_algorithms/comparisons_array.cc    |  4 ---
 .../unique_ptr/specialized_algorithms/swap.cc      |  2 --
 .../20_util/uses_allocator/construction.cc         |  2 --
 .../testsuite/20_util/uses_allocator/value.cc      |  1 -
 libstdc++-v3/testsuite/20_util/variant/run.cc      | 36 ----------------------
 .../20_util/weak_ptr/observers/owner_before.cc     |  4 ---
 .../21_strings/basic_string/allocator/char/copy.cc |  3 --
 .../basic_string/allocator/char/copy_assign.cc     |  2 --
 .../21_strings/basic_string/allocator/char/move.cc |  2 --
 .../basic_string/allocator/char/move_assign.cc     |  3 --
 .../21_strings/basic_string/allocator/char/swap.cc |  2 --
 .../basic_string/allocator/wchar_t/copy.cc         |  3 --
 .../basic_string/allocator/wchar_t/copy_assign.cc  |  2 --
 .../basic_string/allocator/wchar_t/move.cc         |  2 --
 .../basic_string/allocator/wchar_t/move_assign.cc  |  3 --
 .../basic_string/allocator/wchar_t/swap.cc         |  2 --
 .../21_strings/basic_string/capacity/1.cc          |  2 --
 .../21_strings/basic_string/capacity/char/1.cc     |  1 -
 .../21_strings/basic_string/capacity/char/18654.cc |  1 -
 .../21_strings/basic_string/capacity/char/2.cc     |  2 --
 .../basic_string/capacity/char/shrink_to_fit.cc    |  2 --
 .../21_strings/basic_string/capacity/wchar_t/1.cc  |  1 -
 .../basic_string/capacity/wchar_t/18654.cc         |  1 -
 .../21_strings/basic_string/capacity/wchar_t/2.cc  |  2 --
 .../basic_string/capacity/wchar_t/shrink_to_fit.cc |  2 --
 .../21_strings/basic_string/cons/char/1.cc         |  1 -
 .../21_strings/basic_string/cons/char/2.cc         |  2 --
 .../21_strings/basic_string/cons/char/3.cc         |  1 -
 .../21_strings/basic_string/cons/char/4.cc         |  2 --
 .../21_strings/basic_string/cons/char/42261.cc     |  1 -
 .../21_strings/basic_string/cons/char/5.cc         |  2 --
 .../21_strings/basic_string/cons/char/6.cc         |  2 --
 .../21_strings/basic_string/cons/char/7.cc         |  2 --
 .../21_strings/basic_string/cons/char/8.cc         |  2 --
 .../21_strings/basic_string/cons/char/moveable.cc  |  2 --
 .../21_strings/basic_string/cons/char/moveable2.cc |  2 --
 .../21_strings/basic_string/cons/wchar_t/1.cc      |  1 -
 .../21_strings/basic_string/cons/wchar_t/2.cc      |  2 --
 .../21_strings/basic_string/cons/wchar_t/3.cc      |  1 -
 .../21_strings/basic_string/cons/wchar_t/4.cc      |  2 --
 .../21_strings/basic_string/cons/wchar_t/42261.cc  |  1 -
 .../21_strings/basic_string/cons/wchar_t/5.cc      |  2 --
 .../21_strings/basic_string/cons/wchar_t/6.cc      |  2 --
 .../21_strings/basic_string/cons/wchar_t/7.cc      |  2 --
 .../21_strings/basic_string/cons/wchar_t/8.cc      |  2 --
 .../basic_string/cons/wchar_t/moveable.cc          |  2 --
 .../basic_string/cons/wchar_t/moveable2.cc         |  2 --
 .../basic_string/element_access/char/1.cc          |  4 +--
 .../basic_string/element_access/char/2.cc          |  4 +--
 .../basic_string/element_access/char/3.cc          |  4 +--
 .../basic_string/element_access/char/4.cc          |  1 -
 .../basic_string/element_access/char/58163.cc      |  2 --
 .../basic_string/element_access/char/empty.cc      |  2 --
 .../basic_string/element_access/char/front_back.cc |  2 --
 .../basic_string/element_access/wchar_t/1.cc       |  4 +--
 .../basic_string/element_access/wchar_t/2.cc       |  5 +--
 .../basic_string/element_access/wchar_t/3.cc       |  4 +--
 .../basic_string/element_access/wchar_t/4.cc       |  1 -
 .../basic_string/element_access/wchar_t/58163.cc   |  2 --
 .../basic_string/element_access/wchar_t/empty.cc   |  2 --
 .../element_access/wchar_t/front_back.cc           |  2 --
 .../testsuite/21_strings/basic_string/init-list.cc |  6 +---
 .../basic_string/inserters_extractors/char/1.cc    |  4 +--
 .../basic_string/inserters_extractors/char/10.cc   |  2 --
 .../basic_string/inserters_extractors/char/11.cc   |  2 --
 .../inserters_extractors/char/28277.cc             |  1 -
 .../basic_string/inserters_extractors/char/4.cc    |  5 ++-
 .../basic_string/inserters_extractors/char/5.cc    |  2 +-
 .../basic_string/inserters_extractors/char/6.cc    |  2 --
 .../basic_string/inserters_extractors/char/7.cc    |  1 -
 .../basic_string/inserters_extractors/char/8.cc    |  1 -
 .../basic_string/inserters_extractors/char/9.cc    |  1 -
 .../inserters_extractors/pod/10081-in.cc           |  2 --
 .../inserters_extractors/pod/10081-out.cc          |  2 --
 .../basic_string/inserters_extractors/wchar_t/1.cc |  4 +--
 .../inserters_extractors/wchar_t/10.cc             |  2 --
 .../inserters_extractors/wchar_t/11.cc             |  2 --
 .../inserters_extractors/wchar_t/28277.cc          |  1 -
 .../basic_string/inserters_extractors/wchar_t/4.cc |  5 ++-
 .../basic_string/inserters_extractors/wchar_t/5.cc |  2 +-
 .../basic_string/inserters_extractors/wchar_t/6.cc |  2 --
 .../basic_string/inserters_extractors/wchar_t/7.cc |  1 -
 .../basic_string/inserters_extractors/wchar_t/8.cc |  1 -
 .../basic_string/inserters_extractors/wchar_t/9.cc |  1 -
 .../basic_string/modifiers/append/char/1.cc        |  4 +--
 .../basic_string/modifiers/append/char/2.cc        |  2 --
 .../basic_string/modifiers/append/char/3.cc        |  2 --
 .../basic_string/modifiers/append/char/4.cc        |  3 --
 .../basic_string/modifiers/append/wchar_t/1.cc     |  4 +--
 .../basic_string/modifiers/append/wchar_t/2.cc     |  2 --
 .../basic_string/modifiers/append/wchar_t/3.cc     |  2 --
 .../basic_string/modifiers/append/wchar_t/4.cc     |  3 --
 .../basic_string/modifiers/assign/char/1.cc        |  2 --
 .../basic_string/modifiers/assign/char/2.cc        |  2 --
 .../basic_string/modifiers/assign/char/3.cc        |  2 --
 .../basic_string/modifiers/assign/char/4.cc        |  3 --
 .../modifiers/assign/char/move_assign.cc           |  2 --
 .../basic_string/modifiers/assign/wchar_t/1.cc     |  2 --
 .../basic_string/modifiers/assign/wchar_t/2.cc     |  2 --
 .../basic_string/modifiers/assign/wchar_t/3.cc     |  2 --
 .../basic_string/modifiers/assign/wchar_t/4.cc     |  3 --
 .../modifiers/assign/wchar_t/move_assign.cc        |  2 --
 .../basic_string/modifiers/insert/char/1.cc        |  4 +--
 .../basic_string/modifiers/insert/char/2.cc        |  5 +--
 .../basic_string/modifiers/insert/char/3.cc        |  3 --
 .../basic_string/modifiers/insert/wchar_t/1.cc     |  4 +--
 .../basic_string/modifiers/insert/wchar_t/2.cc     |  5 +--
 .../basic_string/modifiers/insert/wchar_t/3.cc     |  3 --
 .../basic_string/modifiers/pop_back/char/1.cc      |  2 --
 .../basic_string/modifiers/pop_back/wchar_t/1.cc   |  2 --
 .../basic_string/modifiers/replace/char/1.cc       |  4 +--
 .../basic_string/modifiers/replace/char/2.cc       |  1 -
 .../basic_string/modifiers/replace/char/3.cc       |  1 -
 .../basic_string/modifiers/replace/char/4.cc       |  1 -
 .../basic_string/modifiers/replace/char/5.cc       |  1 -
 .../basic_string/modifiers/replace/char/6.cc       |  2 --
 .../basic_string/modifiers/replace/char/7.cc       |  3 --
 .../basic_string/modifiers/replace/wchar_t/1.cc    |  4 +--
 .../basic_string/modifiers/replace/wchar_t/2.cc    |  1 -
 .../basic_string/modifiers/replace/wchar_t/3.cc    |  1 -
 .../basic_string/modifiers/replace/wchar_t/4.cc    |  1 -
 .../basic_string/modifiers/replace/wchar_t/5.cc    |  1 -
 .../basic_string/modifiers/replace/wchar_t/6.cc    |  2 --
 .../basic_string/modifiers/replace/wchar_t/7.cc    |  3 --
 .../numeric_conversions/char/dr1261.cc             |  1 -
 .../basic_string/numeric_conversions/char/stod.cc  |  3 +-
 .../basic_string/numeric_conversions/char/stof.cc  |  2 +-
 .../basic_string/numeric_conversions/char/stoi.cc  |  2 +-
 .../basic_string/numeric_conversions/char/stol.cc  |  2 +-
 .../basic_string/numeric_conversions/char/stold.cc |  2 +-
 .../basic_string/numeric_conversions/char/stoll.cc |  2 +-
 .../basic_string/numeric_conversions/char/stoul.cc |  2 +-
 .../numeric_conversions/char/stoull.cc             |  2 +-
 .../numeric_conversions/char/to_string.cc          |  2 +-
 .../numeric_conversions/wchar_t/dr1261.cc          |  1 -
 .../numeric_conversions/wchar_t/stod.cc            |  2 +-
 .../numeric_conversions/wchar_t/stof.cc            |  2 +-
 .../numeric_conversions/wchar_t/stoi.cc            |  2 +-
 .../numeric_conversions/wchar_t/stol.cc            |  2 +-
 .../numeric_conversions/wchar_t/stold.cc           |  2 +-
 .../numeric_conversions/wchar_t/stoll.cc           |  2 +-
 .../numeric_conversions/wchar_t/stoul.cc           |  2 +-
 .../numeric_conversions/wchar_t/stoull.cc          |  2 +-
 .../numeric_conversions/wchar_t/to_wstring.cc      |  1 -
 .../basic_string/operations/compare/char/1.cc      |  1 -
 .../basic_string/operations/compare/char/13650.cc  |  1 -
 .../basic_string/operations/compare/char/2.cc      |  3 --
 .../basic_string/operations/compare/wchar_t/1.cc   |  1 -
 .../operations/compare/wchar_t/13650.cc            |  1 -
 .../basic_string/operations/compare/wchar_t/2.cc   |  3 --
 .../basic_string/operations/data/char/1.cc         |  2 --
 .../basic_string/operations/data/wchar_t/1.cc      |  2 --
 .../basic_string/operations/find/char/1.cc         |  4 +--
 .../basic_string/operations/find/char/2.cc         |  4 +--
 .../basic_string/operations/find/char/3.cc         |  4 +--
 .../basic_string/operations/find/char/4.cc         |  1 -
 .../basic_string/operations/find/char/5.cc         |  1 -
 .../basic_string/operations/find/wchar_t/1.cc      |  4 +--
 .../basic_string/operations/find/wchar_t/2.cc      |  4 +--
 .../basic_string/operations/find/wchar_t/3.cc      |  4 +--
 .../basic_string/operations/find/wchar_t/4.cc      |  1 -
 .../basic_string/operations/find/wchar_t/5.cc      |  1 -
 .../basic_string/operations/rfind/char/1.cc        |  4 +--
 .../basic_string/operations/rfind/char/2.cc        |  4 +--
 .../basic_string/operations/rfind/char/3.cc        |  4 +--
 .../basic_string/operations/rfind/wchar_t/1.cc     |  4 +--
 .../basic_string/operations/rfind/wchar_t/2.cc     |  4 +--
 .../basic_string/operations/rfind/wchar_t/3.cc     |  4 +--
 .../basic_string/operations/substr/char/1.cc       |  4 +--
 .../basic_string/operations/substr/wchar_t/1.cc    |  4 +--
 .../21_strings/basic_string/operators/char/1.cc    |  2 --
 .../21_strings/basic_string/operators/char/2.cc    |  1 -
 .../21_strings/basic_string/operators/char/3.cc    |  1 -
 .../21_strings/basic_string/operators/char/4.cc    |  1 -
 .../21_strings/basic_string/operators/char/5.cc    |  2 --
 .../21_strings/basic_string/operators/wchar_t/1.cc |  2 --
 .../21_strings/basic_string/operators/wchar_t/2.cc |  1 -
 .../21_strings/basic_string/operators/wchar_t/3.cc |  1 -
 .../21_strings/basic_string/operators/wchar_t/4.cc |  1 -
 .../21_strings/basic_string/operators/wchar_t/5.cc |  2 --
 .../21_strings/basic_string_view/capacity/1.cc     |  2 --
 .../21_strings/basic_string_view/cons/char/1.cc    |  1 -
 .../21_strings/basic_string_view/cons/char/2.cc    |  1 -
 .../21_strings/basic_string_view/cons/char/3.cc    |  2 --
 .../21_strings/basic_string_view/cons/wchar_t/1.cc |  1 -
 .../21_strings/basic_string_view/cons/wchar_t/2.cc |  1 -
 .../21_strings/basic_string_view/cons/wchar_t/3.cc |  2 --
 .../basic_string_view/element_access/char/1.cc     |  6 +---
 .../basic_string_view/element_access/char/empty.cc |  2 --
 .../element_access/char/front_back.cc              |  2 --
 .../basic_string_view/element_access/wchar_t/1.cc  |  6 +---
 .../element_access/wchar_t/empty.cc                |  2 --
 .../element_access/wchar_t/front_back.cc           |  2 --
 .../basic_string_view/inserters/char/1.cc          |  6 +---
 .../basic_string_view/inserters/char/2.cc          |  2 +-
 .../basic_string_view/inserters/char/3.cc          |  2 --
 .../basic_string_view/inserters/pod/10081-out.cc   |  2 --
 .../basic_string_view/inserters/wchar_t/1.cc       |  6 +---
 .../basic_string_view/inserters/wchar_t/2.cc       |  2 +-
 .../basic_string_view/inserters/wchar_t/3.cc       |  2 --
 .../modifiers/remove_prefix/char/1.cc              |  2 --
 .../modifiers/remove_prefix/wchar_t/1.cc           |  2 --
 .../modifiers/remove_suffix/char/1.cc              |  2 --
 .../modifiers/remove_suffix/wchar_t/1.cc           |  2 --
 .../basic_string_view/operations/compare/char/1.cc |  1 -
 .../operations/compare/char/13650.cc               |  2 --
 .../operations/compare/wchar_t/1.cc                |  1 -
 .../operations/compare/wchar_t/13650.cc            |  2 --
 .../basic_string_view/operations/copy/char/1.cc    |  4 ---
 .../basic_string_view/operations/copy/wchar_t/1.cc |  4 ---
 .../basic_string_view/operations/data/char/1.cc    |  2 --
 .../basic_string_view/operations/data/wchar_t/1.cc |  2 --
 .../basic_string_view/operations/find/char/1.cc    |  6 +---
 .../basic_string_view/operations/find/char/2.cc    |  6 +---
 .../basic_string_view/operations/find/char/3.cc    |  6 +---
 .../basic_string_view/operations/find/char/4.cc    |  2 --
 .../basic_string_view/operations/find/wchar_t/1.cc |  6 +---
 .../basic_string_view/operations/find/wchar_t/2.cc |  6 +---
 .../basic_string_view/operations/find/wchar_t/3.cc |  6 +---
 .../basic_string_view/operations/find/wchar_t/4.cc |  2 --
 .../basic_string_view/operations/rfind/char/1.cc   |  6 +---
 .../basic_string_view/operations/rfind/char/2.cc   |  6 +---
 .../basic_string_view/operations/rfind/char/3.cc   |  6 +---
 .../operations/rfind/wchar_t/1.cc                  |  6 +---
 .../operations/rfind/wchar_t/2.cc                  |  6 +---
 .../operations/rfind/wchar_t/3.cc                  |  6 +---
 .../operations/string_conversion/1.cc              |  6 +---
 .../basic_string_view/operations/substr/char/1.cc  |  6 +---
 .../operations/substr/wchar_t/1.cc                 |  6 +---
 .../basic_string_view/operators/char/2.cc          |  2 --
 .../basic_string_view/operators/wchar_t/2.cc       |  2 --
 .../testsuite/21_strings/c_strings/char/1.cc       |  1 -
 .../testsuite/21_strings/c_strings/wchar_t/1.cc    |  1 -
 .../21_strings/char_traits/requirements/char/1.cc  |  1 -
 .../char_traits/requirements/char/57704.cc         |  2 --
 .../21_strings/char_traits/requirements/short/1.cc |  1 -
 .../char_traits/requirements/wchar_t/1.cc          |  1 -
 .../testsuite/22_locale/time_get/get/char/1.cc     |  2 +-
 .../testsuite/22_locale/time_get/get/char/2.cc     |  2 +-
 .../testsuite/22_locale/time_get/get/wchar_t/1.cc  |  2 +-
 .../testsuite/22_locale/time_get/get/wchar_t/2.cc  |  2 +-
 .../27_io/basic_filebuf/close/char/4879.cc         |  6 +---
 .../27_io/basic_filebuf/close/char/9964.cc         | 15 ++++-----
 .../27_io/basic_filebuf/imbue/char/13171-2.cc      |  9 ++----
 .../27_io/basic_filebuf/imbue/wchar_t/14975-2.cc   | 11 +++----
 .../27_io/basic_filebuf/seekoff/char/26777.cc      | 11 +++----
 .../27_io/basic_filebuf/underflow/char/10097.cc    | 15 ++++-----
 .../basic_ostream/inserters_arithmetic/char/1.cc   |  4 ---
 .../inserters_arithmetic/char/hexfloat.cc          |  4 ---
 .../inserters_arithmetic/wchar_t/1.cc              |  4 ---
 libstdc++-v3/testsuite/27_io/objects/char/7.cc     | 14 +++------
 .../testsuite/27_io/objects/char/9661-1.cc         | 29 ++++++++---------
 libstdc++-v3/testsuite/27_io/objects/wchar_t/7.cc  | 11 +++----
 .../testsuite/27_io/objects/wchar_t/9661-1.cc      | 27 ++++++++--------
 libstdc++-v3/testsuite/lib/libstdc++.exp           |  2 +-
 libstdc++-v3/testsuite/util/testsuite_hooks.h      | 21 +++++++------
 494 files changed, 174 insertions(+), 1187 deletions(-)

diff --git a/libstdc++-v3/doc/xml/manual/test.xml b/libstdc++-v3/doc/xml/manual/test.xml
index 39a67a1..a1781e5 100644
--- a/libstdc++-v3/doc/xml/manual/test.xml
+++ b/libstdc++-v3/doc/xml/manual/test.xml
@@ -564,7 +564,7 @@ cat 27_io/objects/char/3_xin.in | a.out</programlisting>
       <command>make</command>, or via options for the DejaGnu test framework
       (described below). The latter approach uses the
       <option>--target_board</option> option that was shown earlier.
-      For example, to run the tests with <option>-O1 -D_GLIBCXX_ASSERT</option>
+      For example, to run the tests with <option>-O1 -D_GLIBCXX_ASSERTIONS</option>
       you could use:
 <programlisting>    make RUNTESTFLAGS=--target_board=unix/-O1/-D_GLIBCXX_ASSERTIONS</programlisting>
     </para>
diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in
index ea1a464..cf7f0f7 100755
--- a/libstdc++-v3/scripts/testsuite_flags.in
+++ b/libstdc++-v3/scripts/testsuite_flags.in
@@ -56,7 +56,7 @@ case ${query} in
       echo ${CC}
       ;;
     --cxxflags)
-      CXXFLAGS_default="-D_GLIBCXX_ASSERT -fmessage-length=0 -fno-show-column"
+      CXXFLAGS_default="-fmessage-length=0 -fno-show-column"
       CXXFLAGS_config="@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@"
       echo ${CXXFLAGS_default} ${CXXFLAGS_config} 
       ;;
diff --git a/libstdc++-v3/testsuite/18_support/50594.cc b/libstdc++-v3/testsuite/18_support/50594.cc
index 82b00f2..88c87ee 100644
--- a/libstdc++-v3/testsuite/18_support/50594.cc
+++ b/libstdc++-v3/testsuite/18_support/50594.cc
@@ -56,8 +56,6 @@ void operator delete(void* p)
 // libstdc++/50594
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::string s = "Hello World, this is not a small string.";
   }
diff --git a/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc b/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc
index 951ef23..c12852b 100644
--- a/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc
+++ b/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc
@@ -26,7 +26,6 @@
 // libstdc++/14493
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   bad_alloc ba;
diff --git a/libstdc++-v3/testsuite/18_support/bad_cast/what.cc b/libstdc++-v3/testsuite/18_support/bad_cast/what.cc
index d69ce9b..b960660 100644
--- a/libstdc++-v3/testsuite/18_support/bad_cast/what.cc
+++ b/libstdc++-v3/testsuite/18_support/bad_cast/what.cc
@@ -26,7 +26,6 @@
 // libstdc++/14493
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   bad_cast bc;
diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/what.cc b/libstdc++-v3/testsuite/18_support/bad_exception/what.cc
index dfb19c7..28df237 100644
--- a/libstdc++-v3/testsuite/18_support/bad_exception/what.cc
+++ b/libstdc++-v3/testsuite/18_support/bad_exception/what.cc
@@ -26,7 +26,6 @@
 // libstdc++/14493
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   bad_exception be;
diff --git a/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc b/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc
index 4469236..633175b 100644
--- a/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc
+++ b/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc
@@ -26,7 +26,6 @@
 // libstdc++/14493
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   bad_typeid bt;
diff --git a/libstdc++-v3/testsuite/18_support/exception/38732.cc b/libstdc++-v3/testsuite/18_support/exception/38732.cc
index 132173b..926c47d 100644
--- a/libstdc++-v3/testsuite/18_support/exception/38732.cc
+++ b/libstdc++-v3/testsuite/18_support/exception/38732.cc
@@ -61,7 +61,6 @@ extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
 // PR libstdc++/38732
 void test01 ()
 {
-  bool test __attribute__((unused)) = true;
   try {
     throw 0;
   } catch(...) {
diff --git a/libstdc++-v3/testsuite/18_support/exception/what.cc b/libstdc++-v3/testsuite/18_support/exception/what.cc
index 6e4e7d6..334923d 100644
--- a/libstdc++-v3/testsuite/18_support/exception/what.cc
+++ b/libstdc++-v3/testsuite/18_support/exception/what.cc
@@ -26,7 +26,6 @@
 // libstdc++/14493
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   exception e;
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
index fbb01ae..c1e9a05 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
@@ -25,7 +25,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   {
     // Put some non-zero bytes on the stack
     void* p __attribute__((unused)) = &test;
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
index 2383cee..79459eb 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
@@ -27,7 +27,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   exception_ptr ep = current_exception();
@@ -36,7 +35,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   try {
@@ -49,7 +47,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   try {
@@ -62,7 +59,6 @@ void test03()
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   try {
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
index e350df3..ada652e 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
@@ -39,7 +39,6 @@ public:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -56,7 +55,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -71,7 +69,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -89,7 +86,6 @@ void test03()
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -119,7 +115,6 @@ void test05_helper()
 
 void test05()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -145,7 +140,6 @@ void test06_helper()
 
 void test06()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
@@ -165,7 +159,6 @@ std::exception_ptr gep;
 
 void test99()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   may_destruct = false;
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
index b496bb3..b9ded35 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::exception_ptr p = std::make_exception_ptr(0);
 
   VERIFY( !(p == 0) );
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
index f0b61b1..567af32 100644
--- a/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
@@ -40,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   try {
diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc b/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
index e652c31..af6f90c 100644
--- a/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
@@ -23,8 +23,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::nested_exception e;
 
   VERIFY( e.nested_ptr() == 0 );
@@ -32,8 +30,6 @@ void test01()
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   try
   {
     throw 42;
diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc b/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
index bfb8ee0..467d371 100644
--- a/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
@@ -23,8 +23,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   try
   {
     throw std::nested_exception();
@@ -37,8 +35,6 @@ void test01()
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   try
   {
     throw 42;
diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
index 7751213..b042084 100644
--- a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
@@ -30,7 +30,7 @@ struct derived2 : base, std::nested_exception { };
 
 void test01() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
@@ -55,7 +55,7 @@ void test01()
 
 void test02() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
@@ -72,7 +72,7 @@ void test02()
 
 void test03() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
index 31d822b..fd374e5 100644
--- a/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
@@ -23,7 +23,7 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc b/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
index ac37f02..f768b1e 100644
--- a/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
+++ b/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
@@ -30,7 +30,7 @@ struct uninheritable final { };
 
 void test01() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
@@ -53,7 +53,7 @@ void test01()
 
 void test02() 
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
@@ -76,7 +76,7 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
 
   try
   {
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/char16_32_t.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/char16_32_t.cc
index 546c5b2..9e3aadb 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/char16_32_t.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/char16_32_t.cc
@@ -31,8 +31,6 @@ template<typename T, typename R>
   void
   do_test()
   {
-    bool test __attribute__((unused)) = true;
-
     typedef std::numeric_limits<T> char_type;
     typedef std::numeric_limits<R> impl_type;
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
index ea08d56..aa2ec00 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
@@ -28,10 +28,8 @@
 #include <testsuite_hooks.h>
 
 // libstdc++/5045
-bool test03()
+void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::numeric_limits<bool>::digits10 == 0 );
   if (__CHAR_BIT__ == 8)
     {
@@ -53,7 +51,6 @@ bool test03()
       VERIFY( std::numeric_limits<signed long long>::digits10 == 18 );
       VERIFY( std::numeric_limits<unsigned long long>::digits10 == 19 );
     }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/dr559.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/dr559.cc
index f4979fd..35ec411 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/dr559.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/dr559.cc
@@ -26,7 +26,6 @@
 template<typename T>
   void do_test_aux()
   {
-    bool test __attribute__((unused)) = true;
     typedef std::numeric_limits<T> cv_limits;
     typedef std::numeric_limits<typename std::remove_cv<T>::type> limits;
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
index 5a2aa7b..c999fee 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
@@ -30,7 +30,6 @@
 template<typename T>
 void test_epsilon()
 {
-  bool test __attribute__((unused)) = true;
   T epsilon = std::numeric_limits<T>::epsilon();
   T one = 1;
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
index 1930d15..f6f5b67 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
@@ -52,10 +52,8 @@ test_is_iec559()
 }
 
 // libstdc++/8949
-bool test04()
+void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( !std::numeric_limits<short>::is_iec559 );
   VERIFY( !std::numeric_limits<unsigned short>::is_iec559 );
   VERIFY( !std::numeric_limits<int>::is_iec559 );
@@ -64,7 +62,6 @@ bool test04()
   VERIFY( !std::numeric_limits<unsigned long>::is_iec559 );
   VERIFY( !std::numeric_limits<long long>::is_iec559 );
   VERIFY( !std::numeric_limits<unsigned long long>::is_iec559 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
index 47a48bb..88face42 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
@@ -35,7 +35,6 @@
 
 void test_sign()
 {
-  bool test __attribute__((unused)) = true;
   VERIFY( std::numeric_limits<char>::is_signed == char_is_signed );
   VERIFY( std::numeric_limits<signed char>::is_signed == true );
   VERIFY( std::numeric_limits<unsigned char>::is_signed == false );
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/lowest.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/lowest.cc
index 8969ddf..9001f31 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/lowest.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/lowest.cc
@@ -30,7 +30,6 @@ template<typename T>
   void
   do_test(std::true_type)
   {
-    bool test __attribute__((unused)) = true;
     T limits_min = std::numeric_limits<T>::min();
     VERIFY( std::numeric_limits<T>::lowest() == limits_min );
   }
@@ -39,7 +38,6 @@ template<typename T>
   void
   do_test(std::false_type)
   {
-    bool test __attribute__((unused)) = true;
     T limits_max = std::numeric_limits<T>::max();
     VERIFY( std::numeric_limits<T>::lowest() == -limits_max );
   }
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/max_digits10.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/max_digits10.cc
index 4f5c601..f6a5114 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/max_digits10.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/max_digits10.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::numeric_limits<bool>::max_digits10 == 0 );
   VERIFY( std::numeric_limits<char>::max_digits10 == 0 );
   VERIFY( std::numeric_limits<signed char>::max_digits10 == 0 );
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
index d51c58f..2cddded 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
@@ -61,7 +61,6 @@ DEFINE_EXTREMA(long double, LDBL_MIN, LDBL_MAX);
 template<typename T>
 void test_extrema()
 {
-  bool test __attribute__((unused)) = true;
   T limits_min = std::numeric_limits<T>::min();
   T limits_max = std::numeric_limits<T>::max();
   T extrema_min = extrema<T>::min;
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
index 6c11b6a..04ba194 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
@@ -43,9 +43,8 @@ struct B
 };
 
 
-bool test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::numeric_limits< A<B> > obj;
 
   VERIFY( !obj.is_specialized );
@@ -78,7 +77,6 @@ bool test01()
   VERIFY( !obj.traps );
   VERIFY( !obj.tinyness_before );
   VERIFY( obj.round_style == std::round_toward_zero );
-  return test;
 }
 
 // test linkage of the generic bits
diff --git a/libstdc++-v3/testsuite/18_support/type_info/hash_code.cc b/libstdc++-v3/testsuite/18_support/type_info/hash_code.cc
index 8758222b..4bf3d24 100644
--- a/libstdc++-v3/testsuite/18_support/type_info/hash_code.cc
+++ b/libstdc++-v3/testsuite/18_support/type_info/hash_code.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   class Abraca { };
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc
index 56e9f28..c7b98ba 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/copy_neg.cc
@@ -23,8 +23,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::test_category c1;
   __gnu_test::test_category c2(c1); // { dg-error "deleted" }
 
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/default.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/default.cc
index e3238ce7..d801a96 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/default.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/cons/default.cc
@@ -23,8 +23,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   __gnu_test::test_category c1;
   __gnu_test::test_derived_category c2;
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/equal.cc
index 52c4b45..134c46a 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/equal.cc
@@ -24,8 +24,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::test_category c1;
   __gnu_test::test_derived_category c2;
   VERIFY( c1 == c1 );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/not_equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/not_equal.cc
index 7ba797c..5c412e1 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/not_equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/operators/not_equal.cc
@@ -23,8 +23,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::test_category c1;
   __gnu_test::test_derived_category c2;
   VERIFY( !(c1 != c1) );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc
index d89f016..ecddfb6 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/1.cc
@@ -24,8 +24,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   std::error_code e1;
   VERIFY( e1.value() == 0 );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc
index 989f29d..f441c21 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/cons/39882.cc
@@ -47,8 +47,6 @@ namespace std
 // libstdc++/39882
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_code ec1(my_err);
   VERIFY( ec1 == make_error_code(my_err) );
 }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc
index d810d7ba..878aa21 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/modifiers/39882.cc
@@ -47,8 +47,6 @@ namespace std
 // libstdc++/39882
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_code ec2;
   ec2 = my_err;
   VERIFY( ec2 == make_error_code(my_err) );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc
index 0452d0b..a8949d8 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool.cc
@@ -25,8 +25,6 @@
 // unspecified bool operator positive tests
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   std::error_code e1;
   if (static_cast<bool>(e1))
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc
index 1b493fb..193a7ce 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/equal.cc
@@ -25,8 +25,6 @@
 // unspecified bool operator positive tests
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_code e1;
   std::error_code e2(std::make_error_code(std::errc::operation_not_supported));
 
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc
index e4696cf..544d126 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/not_equal.cc
@@ -25,8 +25,6 @@
 // unspecified bool operator positive tests
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_code e1;
   std::error_code e2(std::make_error_code(std::errc::operation_not_supported));
 
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/1.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/1.cc
index 772164c..51cfcae 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   std::error_condition e1;
   VERIFY( e1.value() == 0 );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc
index d989847..6198cde 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/cons/39881.cc
@@ -47,8 +47,6 @@ namespace std
 // libstdc++/39881
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_condition ec1(my_err);
   VERIFY( ec1 == make_error_condition(my_err) );
 }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc
index 98515c8..7c14406 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/modifiers/39881.cc
@@ -47,8 +47,6 @@ namespace std
 // libstdc++/39881
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_condition ec2;
   ec2 = my_err;
   VERIFY( ec2 == make_error_condition(my_err) );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool.cc
index ccb0def..e5ed5c5 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool.cc
@@ -24,8 +24,6 @@
 // unspecified bool operator positive tests
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   std::error_condition e1;
   if (static_cast<bool>(e1))
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/equal.cc
index ad57353..3a4bcdd 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/equal.cc
@@ -24,8 +24,6 @@
 // unspecified bool operator positive tests
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_condition e1;
   std::error_condition e2(std::errc::operation_not_supported);
 
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/not_equal.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/not_equal.cc
index e8b0c2e..6c06031 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/not_equal.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/not_equal.cc
@@ -24,8 +24,6 @@
 // unspecified bool operator positive tests
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::error_condition e1;
   std::error_condition e2(std::errc::operation_not_supported);
 
diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-1.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-1.cc
index 4b8bfea..c2ef01e 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-1.cc
@@ -27,7 +27,6 @@
 // libstdc++/1972
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight, no water error");
 
   // 1
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight error");
   std::domain_error x(s);
   
diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-2.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-2.cc
index 6d79b63..dab91a7 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-2.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-2.cc
@@ -33,7 +33,6 @@ public:
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   try
     { throw fuzzy_logic(); }
   catch(const fuzzy_logic& obj)
diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc
index 2e6468a..9bbc8cf 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc
@@ -38,7 +38,6 @@ void allocate_on_stack(void)
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("CA ISO emergency once again:immediate power down");
   const char* strlit1 = "wish I lived in Palo Alto";
   const char* strlit2 = "...or Santa Barbara";
diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc
index 5e050ac..85aca9a 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc
@@ -27,7 +27,6 @@ void test01()
 {
   typedef std::logic_error test_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string xxx(10000, 'x');
   test_type t(xxx);
   VERIFY( std::strcmp(t.what(), xxx.c_str()) == 0 );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-1.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-1.cc
index 05a67a7..c3b08ab 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-1.cc
@@ -27,7 +27,6 @@
 // libstdc++/1972
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight, no water error");
 
   // 1
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight error");
   std::range_error x(s);
   
diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-2.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-2.cc
index 74346c1..27cf7d9 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-2.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-2.cc
@@ -33,7 +33,6 @@ public:
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   try
     { throw fuzzy_logic(); }
   catch(const fuzzy_logic& obj)
diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc
index 47d8737..70a8b5d 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc
@@ -40,7 +40,6 @@ void allocate_on_stack(void)
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("CA ISO emergency once again:immediate power down");
   const char* strlit1 = "wish I lived in Palo Alto";
   const char* strlit2 = "...or Santa Barbara";
diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc
index 08a71f4..76089a6 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc
@@ -27,7 +27,6 @@ void test01()
 {
   typedef std::runtime_error test_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string xxx(10000, 'x');
   test_type t(xxx);
   VERIFY( std::strcmp(t.what(), xxx.c_str()) == 0 );
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc
index 4a86e38..adbece7 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/cons-1.cc
@@ -24,7 +24,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("too late: boulangerie out of pain au raisin");
   const std::error_code
     e(std::make_error_code(std::errc::operation_not_supported));
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-1.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-1.cc
index 89455b6..6a83ef3 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-1.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-1.cc
@@ -28,7 +28,6 @@ using namespace std;
 // libstdc++/1972
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   string s("lack of sunlight, no water error");
 
   // 1
@@ -43,7 +42,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   string s("lack of sunlight error");
   system_error x(error_code(), s);
   
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-2.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-2.cc
index c7c9d16..f6865b9 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-2.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-2.cc
@@ -32,7 +32,6 @@ public:
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   try
     { throw fuzzy_logic(); }
   catch(const fuzzy_logic& obj)
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-3.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-3.cc
index edb4d76..eedac88 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-3.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-3.cc
@@ -37,7 +37,6 @@ void allocate_on_stack(void)
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("CA ISO emergency once again:immediate power down");
   const char* strlit1 = "wish I lived in Palo Alto";
   const char* strlit2 = "...or Santa Barbara";
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc
index fb6420e..fbd19e3 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-4.cc
@@ -26,7 +26,6 @@
 // Make sure each invocation of what() doesn't grow the message.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("after nine thirty, this request cannot be met");
 
   std::system_error obj =
diff --git a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-big.cc b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-big.cc
index f680486..ba97076 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/system_error/what-big.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/system_error/what-big.cc
@@ -26,7 +26,6 @@ void test01()
 {
   typedef std::system_error test_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string xxx(10000, 'x');
   test_type t(std::error_code(), xxx);
   VERIFY( std::string(t.what()).find(xxx) != std::string::npos );
diff --git a/libstdc++-v3/testsuite/20_util/addressof/1.cc b/libstdc++-v3/testsuite/20_util/addressof/1.cc
index 16482cb..333a3f7 100644
--- a/libstdc++-v3/testsuite/20_util/addressof/1.cc
+++ b/libstdc++-v3/testsuite/20_util/addressof/1.cc
@@ -27,7 +27,6 @@ void f1(int) { }
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
   
   OverloadedAddress* ao1 = new OverloadedAddress();
diff --git a/libstdc++-v3/testsuite/20_util/align/1.cc b/libstdc++-v3/testsuite/20_util/align/1.cc
index bb03733..39b2c70 100644
--- a/libstdc++-v3/testsuite/20_util/align/1.cc
+++ b/libstdc++-v3/testsuite/20_util/align/1.cc
@@ -30,8 +30,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   size_t space = 100;
   void* ptr = new char[space];
   char* const orig_ptr = static_cast<char*>(ptr);
diff --git a/libstdc++-v3/testsuite/20_util/align/2.cc b/libstdc++-v3/testsuite/20_util/align/2.cc
index 2c43ac2..2308048 100644
--- a/libstdc++-v3/testsuite/20_util/align/2.cc
+++ b/libstdc++-v3/testsuite/20_util/align/2.cc
@@ -27,8 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int i = 0;
   void* ptr = &i;
   auto space = sizeof(i);
diff --git a/libstdc++-v3/testsuite/20_util/allocator/1.cc b/libstdc++-v3/testsuite/20_util/allocator/1.cc
index 4fc1aef..6905c86 100644
--- a/libstdc++-v3/testsuite/20_util/allocator/1.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator/1.cc
@@ -44,7 +44,6 @@ void operator delete(void *v) throw()
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::allocator<gnu> obj;
 
   // NB: These should work for various size allocation and
diff --git a/libstdc++-v3/testsuite/20_util/allocator/10378.cc b/libstdc++-v3/testsuite/20_util/allocator/10378.cc
index 7987e1a..a838479 100644
--- a/libstdc++-v3/testsuite/20_util/allocator/10378.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator/10378.cc
@@ -32,7 +32,6 @@ public:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   list<Bob> uniset;
   uniset.push_back(Bob());
diff --git a/libstdc++-v3/testsuite/20_util/allocator/8230.cc b/libstdc++-v3/testsuite/20_util/allocator/8230.cc
index dd2d492..d99c7b8 100644
--- a/libstdc++-v3/testsuite/20_util/allocator/8230.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator/8230.cc
@@ -26,7 +26,7 @@
 // libstdc++/8230
 void test02()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   try 
     {
       std::allocator<int> alloc;
diff --git a/libstdc++-v3/testsuite/20_util/allocator_traits/members/allocate_hint.cc b/libstdc++-v3/testsuite/20_util/allocator_traits/members/allocate_hint.cc
index ba8edde..ceb524c 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_traits/members/allocate_hint.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_traits/members/allocate_hint.cc
@@ -46,8 +46,6 @@ struct hintable_allocator
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<hintable_allocator<X>> traits_type;
   traits_type::allocator_type a;
   traits_type::const_void_pointer v;
@@ -74,8 +72,6 @@ struct unhintable_allocator
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<unhintable_allocator<X>> traits_type;
   traits_type::allocator_type a;
   traits_type::const_void_pointer v;
diff --git a/libstdc++-v3/testsuite/20_util/allocator_traits/members/construct.cc b/libstdc++-v3/testsuite/20_util/allocator_traits/members/construct.cc
index 6d616f1..7b1adb9 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_traits/members/construct.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_traits/members/construct.cc
@@ -52,8 +52,6 @@ struct fake_allocator
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<fake_allocator<X>> traits_type;
   traits_type::allocator_type a;
   X* p = traits_type::allocate(a, 1);
diff --git a/libstdc++-v3/testsuite/20_util/allocator_traits/members/destroy.cc b/libstdc++-v3/testsuite/20_util/allocator_traits/members/destroy.cc
index 930b0b1..0ce8404 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_traits/members/destroy.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_traits/members/destroy.cc
@@ -53,8 +53,6 @@ struct allocator_without_destroy
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<allocator_with_destroy<X>> traits_type;
   traits_type::allocator_type a;
   X* p = 0;
@@ -65,8 +63,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<allocator_without_destroy<X>> traits_type;
   traits_type::allocator_type a;
   char buf[sizeof(X)];
diff --git a/libstdc++-v3/testsuite/20_util/allocator_traits/members/max_size.cc b/libstdc++-v3/testsuite/20_util/allocator_traits/members/max_size.cc
index c274c4a..745acca 100644
--- a/libstdc++-v3/testsuite/20_util/allocator_traits/members/max_size.cc
+++ b/libstdc++-v3/testsuite/20_util/allocator_traits/members/max_size.cc
@@ -42,8 +42,6 @@ struct unsized_allocator
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<maxsize_allocator<X>> traits_type;
   traits_type::allocator_type a;
   auto size = a.max_size();
@@ -52,8 +50,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<unsized_allocator<X>> traits_type;
   traits_type::allocator_type a;
   auto size = std::numeric_limits<traits_type::size_type>::max();
@@ -62,8 +58,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::allocator_traits<unsized_allocator<int>> traits_type;
   traits_type::allocator_type a;
   auto size = std::numeric_limits<traits_type::size_type>::max();
diff --git a/libstdc++-v3/testsuite/20_util/any/assign/exception.cc b/libstdc++-v3/testsuite/20_util/any/assign/exception.cc
index 11a1a55..31a87a2 100644
--- a/libstdc++-v3/testsuite/20_util/any/assign/exception.cc
+++ b/libstdc++-v3/testsuite/20_util/any/assign/exception.cc
@@ -57,8 +57,8 @@ int main()
         a1 = a2;
     } catch (...) {
         auto x = std::any_cast<Good>(a1);
-        assert(del_count == 0);
-        assert(a1.has_value());
+        VERIFY( del_count == 0 );
+        VERIFY( a1.has_value() );
         std::any_cast<Good>(a1);
     }
     std::any a3 = Good();
@@ -70,8 +70,8 @@ int main()
         a3 = a4;
     } catch (...) {
         auto x = std::any_cast<Good>(a1);
-        assert(del_count == 0);
-        assert(a1.has_value());
+        VERIFY( del_count == 0 );
+        VERIFY( a1.has_value() );
         std::any_cast<Good>(a1);
     }
 }
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/1.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/1.cc
index c0cafa8..55a25e9 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/1.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/1.cc
@@ -62,7 +62,6 @@ int
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::auto_ptr<A> A_default;
   VERIFY( A_default.get() == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/2.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/2.cc
index 8200edb..47b24bb 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/2.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/2.cc
@@ -59,7 +59,6 @@ int
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::auto_ptr<A> A_from_A(new A);
   std::auto_ptr<B> B_from_B(new B);
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/3.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/3.cc
index 3245fa7..82c87b8 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/3.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/3.cc
@@ -59,7 +59,6 @@ int
 test03()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::auto_ptr<A> A_from_ptr_A;
   std::auto_ptr<A> A_from_ptr_B;
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/4.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/4.cc
index 8455c92..279665f 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/4.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/4.cc
@@ -60,7 +60,6 @@ int
 test04()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   {/*lifetine scope*/
     std::auto_ptr<A> A_from_A(new A);
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/5.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/5.cc
index a9e9032..16e28ca 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/5.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/5.cc
@@ -68,7 +68,6 @@ private:
 int 
 test05()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   pimpl<A>();
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/6.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/6.cc
index 5458120..02545c7 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/6.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/6.cc
@@ -61,7 +61,6 @@ int
 test06()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::auto_ptr<A> A_from_A(new A);
   std::auto_ptr<A> A_from_A_ptr(A_from_A.release());
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/7.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/7.cc
index 32ca098..1e8319f 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr/7.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr/7.cc
@@ -70,7 +70,6 @@ static void drain(std::auto_ptr<T>)
 int
 test07()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   drain(source<A>());
diff --git a/libstdc++-v3/testsuite/20_util/bind/all_bound.cc b/libstdc++-v3/testsuite/20_util/bind/all_bound.cc
index 9f6570c..cf70f39 100644
--- a/libstdc++-v3/testsuite/20_util/bind/all_bound.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/all_bound.cc
@@ -24,8 +24,6 @@
 // Operations on empty function<> objects
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::bind(std::plus<int>(), 3, 5)() == 8 );
   VERIFY( std::bind(std::minus<int>(), 3, 5)() == -2 );
   VERIFY( std::bind<int>(std::plus<int>(), 3, 5)() == 8 );
diff --git a/libstdc++-v3/testsuite/20_util/bind/conv_result.cc b/libstdc++-v3/testsuite/20_util/bind/conv_result.cc
index cf7aa1c..1d6d91a 100644
--- a/libstdc++-v3/testsuite/20_util/bind/conv_result.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/conv_result.cc
@@ -30,7 +30,6 @@ struct X
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::bind;
   using std::ref;
   ::X x = { true };
diff --git a/libstdc++-v3/testsuite/20_util/bind/cv_quals.cc b/libstdc++-v3/testsuite/20_util/bind/cv_quals.cc
index e81780e..ebf654f 100644
--- a/libstdc++-v3/testsuite/20_util/bind/cv_quals.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/cv_quals.cc
@@ -42,8 +42,6 @@ using std::placeholders::_2;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   auto b0 = std::bind(X());
   VERIFY( b0() == 0 );
 
@@ -59,8 +57,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   auto b0 = std::bind<int>(X());
   VERIFY( b0() == 0 );
 
@@ -76,8 +72,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   auto b0 = std::bind(X(), 0, _1, _2);
   VERIFY( b0(0, 0) == 0 );
 
@@ -93,8 +87,6 @@ void test03()
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   auto b0 = std::bind<int>(X(), 0, _1, _2);
   VERIFY( b0(0, 0) == 0 );
 
diff --git a/libstdc++-v3/testsuite/20_util/bind/cv_quals_2.cc b/libstdc++-v3/testsuite/20_util/bind/cv_quals_2.cc
index a3b5c3b..9252285 100644
--- a/libstdc++-v3/testsuite/20_util/bind/cv_quals_2.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/cv_quals_2.cc
@@ -30,8 +30,6 @@ struct X
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const auto b0 = std::bind(X());
   VERIFY( b0() == 0 );
 
diff --git a/libstdc++-v3/testsuite/20_util/bind/nested.cc b/libstdc++-v3/testsuite/20_util/bind/nested.cc
index 04425ef..823978e 100644
--- a/libstdc++-v3/testsuite/20_util/bind/nested.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/nested.cc
@@ -24,7 +24,6 @@
 // Operations on empty function<> objects
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::placeholders;
 
   int five = 5;
diff --git a/libstdc++-v3/testsuite/20_util/bind/placeholders.cc b/libstdc++-v3/testsuite/20_util/bind/placeholders.cc
index 14b9ffb..0ddaa01 100644
--- a/libstdc++-v3/testsuite/20_util/bind/placeholders.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/placeholders.cc
@@ -24,7 +24,6 @@
 // Operations on empty function<> objects
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::placeholders;
 
   int five = 5;
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref.cc b/libstdc++-v3/testsuite/20_util/bind/ref.cc
index 6b7fc53..a0c7e60 100644
--- a/libstdc++-v3/testsuite/20_util/bind/ref.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/ref.cc
@@ -37,7 +37,6 @@ private:
 // Operations on empty function<> objects
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::bind;
   using std::ref;
   ::X x;
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref2.cc b/libstdc++-v3/testsuite/20_util/bind/ref2.cc
index 161a2b2..d9ba387 100644
--- a/libstdc++-v3/testsuite/20_util/bind/ref2.cc
+++ b/libstdc++-v3/testsuite/20_util/bind/ref2.cc
@@ -28,8 +28,6 @@ int inc(int& i) { return ++i; }
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int counter = 0;
   std::bind(&inc, _1)(counter);
   VERIFY(counter == 1 );
@@ -47,8 +45,6 @@ struct Inc
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   int counter = 0;
   std::bind(Inc(), _1)(counter);
   VERIFY(counter == 1 );
diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc
index 12ea607..163426d 100644
--- a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc
+++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc
@@ -66,7 +66,6 @@ struct B : A { };
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::common_type;
   using std::is_same;
 
@@ -98,7 +97,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using std::common_type;
   using std::is_same;
   
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/1.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/1.cc
index b74ae9a..3f642b9 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/1.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   duration<int> d0(3);
@@ -59,7 +58,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   duration<int> d7(3);
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/2.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/2.cc
index 015f2ab..d3282ea 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/2.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   duration<int> d0(12);
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/58850.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/58850.cc
index 24f7f09..4891258 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/58850.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/58850.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
 
   typedef duration<std::int64_t, std::ratio<36 * 24 * 36525>> Years;
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr2020.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr2020.cc
index 994e4f7..e9bc53c 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr2020.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr2020.cc
@@ -26,7 +26,6 @@
 // DR 2020
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
 
   constexpr duration<int> d0(12);
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr934-2.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr934-2.cc
index 2073fb8..e059c96 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr934-2.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr934-2.cc
@@ -25,7 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
 
   const duration<int> d0(17);
diff --git a/libstdc++-v3/testsuite/20_util/duration/comparison_operators/1.cc b/libstdc++-v3/testsuite/20_util/duration/comparison_operators/1.cc
index 59d458f..8a44e6b 100644
--- a/libstdc++-v3/testsuite/20_util/duration/comparison_operators/1.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/comparison_operators/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   duration<int> d0(12);
diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/1.cc b/libstdc++-v3/testsuite/20_util/duration/cons/1.cc
index fe54142..d880ec208 100644
--- a/libstdc++-v3/testsuite/20_util/duration/cons/1.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/1.cc
@@ -106,7 +106,6 @@ typedef type_emulator<double> dbl_emulator;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::chrono::duration;
   
   int r = 3;
diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
index e41f093..ead01bb 100644
--- a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
@@ -87,7 +87,6 @@ typedef type_emulator<double> dbl_emulator;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   duration<int> d0(3);
diff --git a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs.cc
index 86f99cf..b23cc34 100644
--- a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::enable_if;
 
   // Positive tests.
diff --git a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs_neg.cc
index b047856..7ff151a 100644
--- a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs_neg.cc
@@ -24,11 +24,10 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::enable_if;
 
   // Negative  tests.
   typedef enable_if<false, int>::type     test2_type;
 }
 
-// { dg-error "does not name a type" "" { target *-*-* } 31 }
+// { dg-error "does not name a type" "" { target *-*-* } 30 }
diff --git a/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/assign.cc b/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/assign.cc
index 024ccb0..58c0442 100644
--- a/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/assign.cc
+++ b/libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/assign.cc
@@ -24,7 +24,6 @@ struct X : public std::enable_shared_from_this<X> { };
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   auto x1 = std::make_shared<X>(), x2 = std::make_shared<X>();
   *x1 = *x2;
   VERIFY( x1->shared_from_this() != x2->shared_from_this() );
diff --git a/libstdc++-v3/testsuite/20_util/exchange/1.cc b/libstdc++-v3/testsuite/20_util/exchange/1.cc
index c8f3c9b..4239611 100644
--- a/libstdc++-v3/testsuite/20_util/exchange/1.cc
+++ b/libstdc++-v3/testsuite/20_util/exchange/1.cc
@@ -41,8 +41,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   struct DefaultConstructible
   {
     DefaultConstructible(int i = 0) : value(i) { }
@@ -63,8 +61,6 @@ double f(double) { return 0; }
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   int (*fp)(int);
   std::exchange(fp, &f);
   VERIFY( fp != nullptr );
diff --git a/libstdc++-v3/testsuite/20_util/forward/a.cc b/libstdc++-v3/testsuite/20_util/forward/a.cc
index b2b808a..6ecf7fb 100644
--- a/libstdc++-v3/testsuite/20_util/forward/a.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/a.cc
@@ -45,7 +45,6 @@ public:
 
   void test() const
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( data_ == 3 );
   }
 };
diff --git a/libstdc++-v3/testsuite/20_util/forward/b.cc b/libstdc++-v3/testsuite/20_util/forward/b.cc
index f2ae8da..6b00c58 100644
--- a/libstdc++-v3/testsuite/20_util/forward/b.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/b.cc
@@ -45,7 +45,6 @@ public:
 
   void test() const
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( data_ == 3 );
   }
 };
diff --git a/libstdc++-v3/testsuite/20_util/forward/d.cc b/libstdc++-v3/testsuite/20_util/forward/d.cc
index a026416..3e23ccf 100644
--- a/libstdc++-v3/testsuite/20_util/forward/d.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/d.cc
@@ -45,7 +45,6 @@ public:
 
   void test() const
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( data_ == 3 );
   }
 };
diff --git a/libstdc++-v3/testsuite/20_util/function/1.cc b/libstdc++-v3/testsuite/20_util/function/1.cc
index 4d06df3..a3442ec 100644
--- a/libstdc++-v3/testsuite/20_util/function/1.cc
+++ b/libstdc++-v3/testsuite/20_util/function/1.cc
@@ -24,8 +24,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Operations on empty function<> objects
 void test01()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/2.cc b/libstdc++-v3/testsuite/20_util/function/2.cc
index 2fd6d32..b5dd40e 100644
--- a/libstdc++-v3/testsuite/20_util/function/2.cc
+++ b/libstdc++-v3/testsuite/20_util/function/2.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put function pointers into function<> wrappers
 void test02()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/3.cc b/libstdc++-v3/testsuite/20_util/function/3.cc
index 8739248..a4d62aa 100644
--- a/libstdc++-v3/testsuite/20_util/function/3.cc
+++ b/libstdc++-v3/testsuite/20_util/function/3.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put nearly-matching function pointers into function<> wrappers
 void test03()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/4.cc b/libstdc++-v3/testsuite/20_util/function/4.cc
index 0827475..00f4716 100644
--- a/libstdc++-v3/testsuite/20_util/function/4.cc
+++ b/libstdc++-v3/testsuite/20_util/function/4.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put function objects into function<> wrappers
 void test04()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/43397.cc b/libstdc++-v3/testsuite/20_util/function/43397.cc
index b8a2680..aae172b 100644
--- a/libstdc++-v3/testsuite/20_util/function/43397.cc
+++ b/libstdc++-v3/testsuite/20_util/function/43397.cc
@@ -36,8 +36,6 @@ struct Foo
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using std::function;
   using std::ref;
 
diff --git a/libstdc++-v3/testsuite/20_util/function/5.cc b/libstdc++-v3/testsuite/20_util/function/5.cc
index cfaa770..9d599dc 100644
--- a/libstdc++-v3/testsuite/20_util/function/5.cc
+++ b/libstdc++-v3/testsuite/20_util/function/5.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put member pointers into function<> wrappers
 void test05()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/6.cc b/libstdc++-v3/testsuite/20_util/function/6.cc
index 1ec27f6..180fbff 100644
--- a/libstdc++-v3/testsuite/20_util/function/6.cc
+++ b/libstdc++-v3/testsuite/20_util/function/6.cc
@@ -24,8 +24,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 struct secret {};
 
 struct noncopyable_function_object_type
diff --git a/libstdc++-v3/testsuite/20_util/function/7.cc b/libstdc++-v3/testsuite/20_util/function/7.cc
index ef939d7..097438c 100644
--- a/libstdc++-v3/testsuite/20_util/function/7.cc
+++ b/libstdc++-v3/testsuite/20_util/function/7.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put reference_wrappers to function pointers into function<> wrappers
 void test07()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/8.cc b/libstdc++-v3/testsuite/20_util/function/8.cc
index 49299a4..7b8bcc0 100644
--- a/libstdc++-v3/testsuite/20_util/function/8.cc
+++ b/libstdc++-v3/testsuite/20_util/function/8.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put reference_wrappers to member pointers
 void test08()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/9.cc b/libstdc++-v3/testsuite/20_util/function/9.cc
index 704476a..88c4a04 100644
--- a/libstdc++-v3/testsuite/20_util/function/9.cc
+++ b/libstdc++-v3/testsuite/20_util/function/9.cc
@@ -25,8 +25,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 // Put function objects into a void-returning function<> wrapper
 void test09()
 {
diff --git a/libstdc++-v3/testsuite/20_util/function/assign/move.cc b/libstdc++-v3/testsuite/20_util/function/assign/move.cc
index c4860ee..7caf8ed 100644
--- a/libstdc++-v3/testsuite/20_util/function/assign/move.cc
+++ b/libstdc++-v3/testsuite/20_util/function/assign/move.cc
@@ -25,8 +25,6 @@ struct { int operator()() { return 2; } } f2;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::function<int()> function;
 
   function fo(f1);
diff --git a/libstdc++-v3/testsuite/20_util/function/cons/move.cc b/libstdc++-v3/testsuite/20_util/function/cons/move.cc
index f2c1bcb..f88a041 100644
--- a/libstdc++-v3/testsuite/20_util/function/cons/move.cc
+++ b/libstdc++-v3/testsuite/20_util/function/cons/move.cc
@@ -25,8 +25,6 @@ struct { int operator()() { return 2; } } f2;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::function<int()> function;
 
   function fo(f1);
diff --git a/libstdc++-v3/testsuite/20_util/function_objects/dr660.cc b/libstdc++-v3/testsuite/20_util/function_objects/dr660.cc
index 83bf020..592cec1 100644
--- a/libstdc++-v3/testsuite/20_util/function_objects/dr660.cc
+++ b/libstdc++-v3/testsuite/20_util/function_objects/dr660.cc
@@ -23,8 +23,6 @@
 // DR 660. Missing Bitwise Operations.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (int i1 = 0; i1 < 1000; ++i1)
     for (int i2 = 0; i2 < 1000; ++i2)
       {
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
index 8da12a0..58762aa 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_flip_set.cc
@@ -27,7 +27,6 @@
 void
 test_bit_flip_set()
 {
-  bool test __attribute__((unused)) = true;
   const unsigned long N = SAMPLES;
   const unsigned long k = N/100;
   const unsigned int len = 67;
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
index 8275523..7cc5b7c 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_bit_string_set.cc
@@ -27,7 +27,6 @@
 void
 test_bit_string_set()
 {
-  bool test __attribute__((unused)) = true;
   const unsigned long N = SAMPLES;
   const unsigned long k = N/100;
   std::vector<std::string> set;
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
index fae7bde..56cca2d 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc
@@ -25,7 +25,6 @@
 void
 test_document_words()
 {
-  bool test __attribute__((unused)) = true;
   const std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   std::ifstream in(f_name);
   VERIFY( in.is_open() );
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
index e4ff66e..697ddec 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_numeric_pattern_set.cc
@@ -27,7 +27,6 @@
 void
 test_numeric_pattern_set()
 {
-  bool test __attribute__((unused)) = true;
   const unsigned long N = SAMPLES;
   const unsigned long k = N/100;
   std::vector<std::string> set;
diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
index 075f1cd..959070a 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_uniform_random.cc
@@ -26,7 +26,6 @@
 void
 test_uniform_random()
 {
-  bool test __attribute__((unused)) = true;
   std::srand(137);
   std::unordered_set<std::string> set;
   std::string s;
diff --git a/libstdc++-v3/testsuite/20_util/hash/operators/size_t.cc b/libstdc++-v3/testsuite/20_util/hash/operators/size_t.cc
index e82d962..06b8a73 100644
--- a/libstdc++-v3/testsuite/20_util/hash/operators/size_t.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/operators/size_t.cc
@@ -26,8 +26,6 @@ template<typename T>
   void
   do_test()
   {
-    bool test __attribute__((unused)) = true;
-
     typedef T 				value_type;
     typedef std::hash<value_type> 	hash_type;
     using std::size_t;
diff --git a/libstdc++-v3/testsuite/20_util/hash/quality.cc b/libstdc++-v3/testsuite/20_util/hash/quality.cc
index 63b6e2b..014788c 100644
--- a/libstdc++-v3/testsuite/20_util/hash/quality.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/quality.cc
@@ -59,7 +59,6 @@ random_strings(unsigned int n, unsigned int len)
 double
 score_from_varying_position(string s, unsigned int index)
 {
-  bool test __attribute__((unused)) = true;
   unsigned int bits_in_hash_code = sizeof(size_t) * 8;
 
   // We'll iterate through all 256 vals for s[index], leaving the rest
@@ -146,7 +145,6 @@ quality_test(unsigned int num_strings, unsigned int string_size)
 void
 quality_test()
 {
-  bool test __attribute__((unused)) = true;
   srand(137);
   double sum_of_scores = 0;
   for (unsigned int i = 0; i < num_quality_tests; i++)
diff --git a/libstdc++-v3/testsuite/20_util/integral_constant/static_definition.cc b/libstdc++-v3/testsuite/20_util/integral_constant/static_definition.cc
index 58ae0459..f3fa280 100644
--- a/libstdc++-v3/testsuite/20_util/integral_constant/static_definition.cc
+++ b/libstdc++-v3/testsuite/20_util/integral_constant/static_definition.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const bool* p = &std::integral_constant<bool, true>::value;
   VERIFY( p );
 }
diff --git a/libstdc++-v3/testsuite/20_util/integral_constant/true_false_value.cc b/libstdc++-v3/testsuite/20_util/integral_constant/true_false_value.cc
index 5386613..bf9e324 100644
--- a/libstdc++-v3/testsuite/20_util/integral_constant/true_false_value.cc
+++ b/libstdc++-v3/testsuite/20_util/integral_constant/true_false_value.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::true_type;
   using std::false_type;
 
diff --git a/libstdc++-v3/testsuite/20_util/is_function/24808.cc b/libstdc++-v3/testsuite/20_util/is_function/24808.cc
index eeec1ec..066b700 100644
--- a/libstdc++-v3/testsuite/20_util/is_function/24808.cc
+++ b/libstdc++-v3/testsuite/20_util/is_function/24808.cc
@@ -24,7 +24,6 @@
 // libstdc++/24808
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::is_function;
   using namespace __gnu_test;
 
diff --git a/libstdc++-v3/testsuite/20_util/is_object/24808.cc b/libstdc++-v3/testsuite/20_util/is_object/24808.cc
index f209ca2..77bb69e 100644
--- a/libstdc++-v3/testsuite/20_util/is_object/24808.cc
+++ b/libstdc++-v3/testsuite/20_util/is_object/24808.cc
@@ -24,7 +24,6 @@
 // libstdc++/24808
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::is_object;
   using namespace __gnu_test;
 
diff --git a/libstdc++-v3/testsuite/20_util/move_if_noexcept/1.cc b/libstdc++-v3/testsuite/20_util/move_if_noexcept/1.cc
index 36b170f..7da6919 100644
--- a/libstdc++-v3/testsuite/20_util/move_if_noexcept/1.cc
+++ b/libstdc++-v3/testsuite/20_util/move_if_noexcept/1.cc
@@ -93,8 +93,6 @@ private:
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   noexcept_move_copy nemc1;
   auto nemc2 __attribute__((unused)) = std::move_if_noexcept(nemc1);
   VERIFY( nemc1 == false );
diff --git a/libstdc++-v3/testsuite/20_util/move_if_noexcept/constexpr.cc b/libstdc++-v3/testsuite/20_util/move_if_noexcept/constexpr.cc
index b12d8f9..a9a9ebf 100644
--- a/libstdc++-v3/testsuite/20_util/move_if_noexcept/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/move_if_noexcept/constexpr.cc
@@ -28,8 +28,6 @@ struct simple
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   constexpr simple s { 5 };
   constexpr auto s2  __attribute__((unused)) = std::move_if_noexcept(s);
 }
diff --git a/libstdc++-v3/testsuite/20_util/owner_less/cmp.cc b/libstdc++-v3/testsuite/20_util/owner_less/cmp.cc
index 552eb92..8fdc4ad 100644
--- a/libstdc++-v3/testsuite/20_util/owner_less/cmp.cc
+++ b/libstdc++-v3/testsuite/20_util/owner_less/cmp.cc
@@ -32,8 +32,6 @@ struct B { A a[2]; };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // test empty shared_ptrs compare equivalent
   std::owner_less<std::shared_ptr<A>> less;
   std::owner_less<std::weak_ptr<A>> wless;
@@ -51,8 +49,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::owner_less<std::shared_ptr<A>> less;
   std::owner_less<std::weak_ptr<A>> wless;
 
@@ -84,8 +80,6 @@ test02()
 int
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::owner_less<std::shared_ptr<A>> less;
   std::owner_less<std::weak_ptr<A>> wless;
 
@@ -108,8 +102,6 @@ test03()
 int
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::owner_less<std::shared_ptr<A>> less;
 
   std::shared_ptr<A> a[3];
diff --git a/libstdc++-v3/testsuite/20_util/pair/1.cc b/libstdc++-v3/testsuite/20_util/pair/1.cc
index ddafd1a..caae3ea 100644
--- a/libstdc++-v3/testsuite/20_util/pair/1.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/1.cc
@@ -45,8 +45,6 @@ template<typename T>
 // heterogeneous
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::pair<bool, long> p_bl_1(true, 433);
   std::pair<bool, long> p_bl_2 = std::make_pair(true, 433);
   VERIFY( p_bl_1 == p_bl_2 );
diff --git a/libstdc++-v3/testsuite/20_util/pair/2.cc b/libstdc++-v3/testsuite/20_util/pair/2.cc
index 1cc1398..dac378e 100644
--- a/libstdc++-v3/testsuite/20_util/pair/2.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/2.cc
@@ -44,8 +44,6 @@ template<typename T>
 // homogeneous
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::pair<bool, bool> p_bb_1(true, false);
   std::pair<bool, bool> p_bb_2 = std::make_pair(true, false);
   VERIFY( p_bb_1 == p_bb_2 );
diff --git a/libstdc++-v3/testsuite/20_util/pair/3.cc b/libstdc++-v3/testsuite/20_util/pair/3.cc
index 3bb61aa..7cfc474 100644
--- a/libstdc++-v3/testsuite/20_util/pair/3.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/3.cc
@@ -45,8 +45,6 @@ template<typename T>
 // const
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::pair<bool, long> p_bl_1(true, 433);
   const std::pair<bool, long> p_bl_2 = std::make_pair(true, 433);
   VERIFY( p_bl_1 == p_bl_2 );
diff --git a/libstdc++-v3/testsuite/20_util/pair/4.cc b/libstdc++-v3/testsuite/20_util/pair/4.cc
index e40ea1c..0e1fbcd 100644
--- a/libstdc++-v3/testsuite/20_util/pair/4.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/4.cc
@@ -44,7 +44,6 @@ template<typename T>
 // const&
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   const gnu_obj& obj1 = gnu_obj(5);
   const std::pair<const char*, gnu_obj> p_sg_1("enlightenment", obj1);
   const std::pair<const char*, gnu_obj> p_sg_2 = 
diff --git a/libstdc++-v3/testsuite/20_util/pair/make_pair/constexpr.cc b/libstdc++-v3/testsuite/20_util/pair/make_pair/constexpr.cc
index b110e26..1195db7 100644
--- a/libstdc++-v3/testsuite/20_util/pair/make_pair/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/make_pair/constexpr.cc
@@ -27,7 +27,6 @@
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::pair<int, float> pair_type;
   constexpr pair_type p1 __attribute__((unused)) = std::make_pair(22, 22.222);
 }
diff --git a/libstdc++-v3/testsuite/20_util/pair/moveable.cc b/libstdc++-v3/testsuite/20_util/pair/moveable.cc
index ecc8eb9..9c26f27 100644
--- a/libstdc++-v3/testsuite/20_util/pair/moveable.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/moveable.cc
@@ -26,8 +26,6 @@
 #include <utility>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void
 test1()
 {
diff --git a/libstdc++-v3/testsuite/20_util/pair/piecewise.cc b/libstdc++-v3/testsuite/20_util/pair/piecewise.cc
index 894e069..854b6de 100644
--- a/libstdc++-v3/testsuite/20_util/pair/piecewise.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/piecewise.cc
@@ -67,8 +67,6 @@ private:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::pair<type_one, type_zero> pp0(std::piecewise_construct,
 				     std::forward_as_tuple(-3),
 				     std::forward_as_tuple());
diff --git a/libstdc++-v3/testsuite/20_util/pair/swap.cc b/libstdc++-v3/testsuite/20_util/pair/swap.cc
index 5a18f25..024fff1 100644
--- a/libstdc++-v3/testsuite/20_util/pair/swap.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/swap.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef __gnu_test::uneq_allocator<double> ua_type;
   ua_type one(1), two(2);
 
diff --git a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp1.cc b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp1.cc
index b86296e..74dcf35 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp1.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp1.cc
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
- 
   VERIFY(( std::ratio_equal<std::ratio<2,6>, std::ratio<1,3>>::value == 1 ));
   VERIFY(( std::ratio_equal<std::ratio<2,6>, std::ratio<1,4>>::value == 0 ));
   
@@ -38,8 +36,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
- 
   VERIFY( (std::ratio_less<std::ratio<1,4>, std::ratio<1,3>>::value == 1) );
   VERIFY( (std::ratio_less<std::ratio<-1,3>, std::ratio<1,3>>::value == 1) );
   
diff --git a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp2.cc b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp2.cc
index 5c5412e..bed70cb 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp2.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp2.cc
@@ -26,8 +26,6 @@ static const std::intmax_t M = INTMAX_MAX;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
- 
   // No overflow with same denominator
   VERIFY( (std::ratio_less<std::ratio<M - 2, M>,
            std::ratio<M - 1, M>>::value == 1) );
diff --git a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp3.cc b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp3.cc
index 2c1c32b..8c6cd98 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp3.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/comparisons/comp3.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( (std::ratio_less<std::ratio<59, 29131>,
 	                   std::ratio<59, 29129>>::value == 1) );
   VERIFY( (std::ratio_less<std::ratio<4733, 13>,
diff --git a/libstdc++-v3/testsuite/20_util/ratio/cons/cons1.cc b/libstdc++-v3/testsuite/20_util/ratio/cons/cons1.cc
index 02a40d0..9ef1c38 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/cons/cons1.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/cons/cons1.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ratio<1,3> r0;
   std::ratio<2,6> r1;  
   std::ratio<2,-6> r2;
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc
index 48630d3..c8bf840 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc
@@ -26,8 +26,6 @@
 // libstdc++/45866
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::ratio<1, 4>::type r_type1;
   typedef std::ratio<3, 2>::type r_type2;
 
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/47913.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/47913.cc
index 75f58a7..8c5254c 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/47913.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/47913.cc
@@ -25,7 +25,6 @@
 // libstdc++/47913
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const intmax_t m1 = (intmax_t)1 << (4 * sizeof(intmax_t) - 1);
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops1.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops1.cc
index cb0b311..32072fe 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops1.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops1.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ratio_add<std::ratio<3,8>, std::ratio<5,12>>::type r;
 
   VERIFY( r.num == 19 );
@@ -37,7 +35,6 @@ test01()
 void
 test02()
 {  
-  bool test __attribute__((unused)) = true;
   std::ratio_subtract<std::ratio<3,8>, std::ratio<5,12>>::type r;
 
   VERIFY( r.num == -1 );
@@ -47,7 +44,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::ratio_multiply<std::ratio<3,8>, std::ratio<5,12>>::type r;
 
   VERIFY( r.num == 5 );
@@ -57,7 +53,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
   std::ratio_divide<std::ratio<3,8>, std::ratio<5,12>>::type r;
 
   VERIFY( r.num == 9 );
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops2.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops2.cc
index 6bf7bf6..8172c77 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops2.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops2.cc
@@ -31,8 +31,6 @@ typedef std::ratio<INTMAX_MAX, 2> max_over_two;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ratio_add<one_over_max, one_over_max>::type r1;
 
   VERIFY( r1.num == two_over_max::num);
@@ -48,9 +46,7 @@ test01()
 
 void
 test02()
-{  
-  bool test __attribute__((unused)) = true;
-  
+{
   std::ratio_subtract<one_over_max, one_over_max>::type r1;
 
   VERIFY( r1.num == 0);
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops3.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops3.cc
index 8b8a064..39ba67a 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops3.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops3.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ratio_multiply<
     std::ratio<2, INTMAX_MAX>,
     std::ratio<INTMAX_MAX, 2>>::type r1;
@@ -45,9 +43,7 @@ test01()
 
 void
 test02()
-{  
-  bool test __attribute__((unused)) = true;
-  
+{
   std::ratio_divide<
     std::ratio<INTMAX_MAX, 2>,
     std::ratio<INTMAX_MAX, 2>>::type r1;
diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
index e5c02ca..b4a1eec 100644
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
@@ -24,8 +24,6 @@
 
 using namespace __gnu_test;
 
-bool test __attribute__((unused)) = true;
-
 struct X
 {
   typedef int result_type;
diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc
index e101fc5..f380f99 100644
--- a/libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc
+++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc
@@ -44,8 +44,6 @@ struct Element
 
 void test01()
 {
-  bool test __attribute((unused)) = false;
-
   typedef std::scoped_allocator_adaptor<Element::allocator_type> alloc1_type;
 
   typedef std::vector<Element, alloc1_type> EltVec;
@@ -59,8 +57,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute((unused)) = false;
-
   typedef std::scoped_allocator_adaptor<Element::allocator_type> inner_alloc_type;
 
   typedef std::vector<Element, inner_alloc_type> EltVec;
diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/2.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/2.cc
index 58b192f..0ef5d7e 100644
--- a/libstdc++-v3/testsuite/20_util/scoped_allocator/2.cc
+++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/2.cc
@@ -120,8 +120,6 @@ template<typename A, typename B>
   void
   test_def()
   {
-    bool test __attribute((unused)) = false;
-
     typedef std::pair<A, B> test_type;
     typedef uneq_allocator<test_type> alloc_type;
     typedef scoped_allocator_adaptor<alloc_type, alloc_type> alloc_adaptor;
@@ -167,8 +165,6 @@ template<typename A, typename B>
   void
   test_copying()
   {
-    bool test __attribute((unused)) = false;
-
     typedef std::pair<A, B> test_type;
     typedef uneq_allocator<test_type> alloc_type;
     typedef scoped_allocator_adaptor<alloc_type, alloc_type> alloc_adaptor;
@@ -218,8 +214,6 @@ template<typename A, typename B>
   void
   test_moving()
   {
-    bool test __attribute((unused)) = false;
-
     typedef std::pair<A, B> test_type;
     typedef uneq_allocator<test_type> alloc_type;
     typedef scoped_allocator_adaptor<alloc_type, alloc_type> alloc_adaptor;
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/assign.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/assign.cc
index 7139f20..7eaa337 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/assign.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/assign.cc
@@ -49,7 +49,6 @@ void
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a;
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr.cc
index d29bd36..105fe11 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr.cc
@@ -63,7 +63,6 @@ int
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a(new A);
   std::auto_ptr<B> b(new B);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
index b0a6394..56d818e 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/auto_ptr_neg.cc
@@ -32,8 +32,6 @@ struct B { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a;
   std::auto_ptr<B> b;
   a = std::move(b);                      // { dg-error "here" }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/move.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/move.cc
index b2a95c4..cef2570 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/move.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/move.cc
@@ -62,7 +62,6 @@ void
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a1;
   std::shared_ptr<A> a2(new A);
@@ -86,7 +85,6 @@ void
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a;
   std::shared_ptr<B> b(new B);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr.cc
index ed97538..5d63029 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/shared_ptr.cc
@@ -62,7 +62,6 @@ void
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a;
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
index 1527e00..46e3bf5 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a;
   std::unique_ptr<A> u;
   a = u; // { dg-error "" }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/cmp.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/cmp.cc
index 39aba41..2eaef29 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/cmp.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/cmp.cc
@@ -36,8 +36,6 @@ struct B : A
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // test empty shared_ptrs compare equivalent
   std::shared_ptr<A> p1;
   std::shared_ptr<B> p2;
@@ -52,8 +50,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> A_default;
 
   std::shared_ptr<A> A_from_A(new A);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/less.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/less.cc
index f60b7ae..6c55d74 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/less.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/less.cc
@@ -41,8 +41,6 @@ namespace std
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::less<std::shared_ptr<A>> less;
   // test empty shared_ptrs compare equivalent
   std::shared_ptr<A> p1;
@@ -57,8 +55,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::less<std::shared_ptr<A>> less;
 
   std::shared_ptr<A> empty;
@@ -81,8 +77,6 @@ test02()
 int
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::less<std::shared_ptr<A>> less;
 
   A a;
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alias.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alias.cc
index a881035..482a5bb 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alias.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alias.cc
@@ -44,7 +44,7 @@ void deletefunc(A* p) { delete p; }
 
 int test01()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   std::shared_ptr<A> a;
   std::shared_ptr<bool> b1(a, &test);
@@ -62,8 +62,6 @@ int test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a(new A);
   std::shared_ptr<int> i1(a, &a->i);
   VERIFY( i1.use_count() == 2 );
@@ -78,8 +76,6 @@ test02()
 int
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<B> b(new B);
   std::shared_ptr<A> a1(b, b.get());
   std::shared_ptr<A> a2(b, &b->a);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alloc.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alloc.cc
index 51570f1..7c480b6 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alloc.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/alloc.cc
@@ -41,7 +41,6 @@ long D::delete_count = 0;
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
   tracker_allocator_counter::reset();
 
   std::shared_ptr<A> p1(new A, deletefunc, tracker_allocator<A>());
@@ -68,7 +67,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
   tracker_allocator_counter::reset();
 
   std::shared_ptr<A> p1(new A, deletefunc, tracker_allocator<A>());
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr.cc
index 3eaf076..7a99490 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/auto_ptr.cc
@@ -31,8 +31,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::auto_ptr<A> a(new A);
   std::shared_ptr<A> a2(std::move(a));
   VERIFY( a.get() == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/copy.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/copy.cc
index 2be1ad5..09d1811 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/copy.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/copy.cc
@@ -61,7 +61,6 @@ struct reset_count_struct
 int test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a1;
   std::shared_ptr<A> a2(a1);
@@ -78,7 +77,6 @@ int
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a1(new A);
   std::shared_ptr<A> a2(a1);
@@ -95,7 +93,6 @@ int
 test03()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<B> b(new B);
   std::shared_ptr<A> a(b);
@@ -112,7 +109,6 @@ int
 test04()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<B> b(new B, &deleter);
   std::shared_ptr<A> a(b);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/default.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/default.cc
index bb53e1c..262674e 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/default.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/default.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a;
   VERIFY( a.get() == 0 );
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/move.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/move.cc
index 77295bc..26786d6 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/move.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/move.cc
@@ -68,7 +68,6 @@ struct reset_count_struct
 int test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a1;
   std::shared_ptr<A> a2(std::move(a1));
@@ -86,7 +85,6 @@ int
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a1(new A);
   std::shared_ptr<A> a2(std::move(a1));
@@ -102,7 +100,6 @@ int
 test03()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<B> b(new B);
   std::shared_ptr<A> a(std::move(b));
@@ -120,7 +117,6 @@ int
 test04()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<B> b(new B, D());
   std::shared_ptr<A> a(std::move(b));
@@ -142,7 +138,6 @@ int
 test05()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a(std::move(std::shared_ptr<A>(new A)));
   VERIFY( a.use_count() == 1 );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/nullptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/nullptr.cc
index 5af8c38..593fc48 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/nullptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/nullptr.cc
@@ -39,8 +39,6 @@ struct deleter
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<int> p = nullptr;
   VERIFY( p.get() == nullptr );
   VERIFY( p.use_count() == 0 );
@@ -50,8 +48,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   deleter d;
   std::shared_ptr<int> p(nullptr, std::ref(d));
   VERIFY( p.get() == nullptr );
@@ -66,8 +62,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   deleter d;
   __gnu_test::tracker_allocator<int> a;
   std::shared_ptr<int> p(nullptr, std::ref(d), a);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/pointer.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/pointer.cc
index fa4bb36..c8d11bd 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/pointer.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/pointer.cc
@@ -33,8 +33,6 @@ struct B : A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = 0;
   std::shared_ptr<A> p(a);
   VERIFY( p.get() == 0 );
@@ -46,8 +44,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   std::shared_ptr<A> p(a);
   VERIFY( p.get() == a );
@@ -60,8 +56,6 @@ test02()
 int
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   B * const b = new B;
   std::shared_ptr<A> p(b);
   VERIFY( p.get() == b );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr.cc
index 58335c3..18e6616 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A> up(new A);
   std::shared_ptr<A> sp(std::move(up));
   VERIFY( up.get() == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_array.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_array.cc
index d01f38c..72eed47 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_array.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_array.cc
@@ -35,8 +35,6 @@ struct A : std::enable_shared_from_this<A>
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A[]> up(new A[2]);
   std::shared_ptr<A> sp(std::move(up));
   VERIFY( up.get() == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc
index 73f9c23..d773d23 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc
@@ -37,8 +37,6 @@ int D::count = 0;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A, D> up(new A, D());
   {
       std::shared_ptr<A> sp(std::move(up));
@@ -52,8 +50,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   D::count = 0;
   std::unique_ptr<A, D> up;
   {
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc
index 49629a2..702daeb 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc
@@ -37,8 +37,6 @@ struct D {
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   D d = D();
   std::unique_ptr<A, D&> up(new A, d);
   {
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_2.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_2.cc
index c15caf7..f29a4b7 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_2.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_2.cc
@@ -39,8 +39,6 @@ struct D {
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   D d;
   std::unique_ptr<A, D&> p1(new A, d);
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
index 2a0ac70..5a28de6 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A> a;
   std::shared_ptr<A> p(a); // { dg-error "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr.cc
index a671798..c0cc05f 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   std::shared_ptr<A> a1(a);
   std::weak_ptr<A> wa(a1);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
index e0f761b..d7d4763 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/alloc.cc
@@ -56,7 +56,6 @@ struct reset_count_struct
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   {
@@ -74,7 +73,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   std::shared_ptr<A> p1;
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
index 9f12aff..425bd27 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
@@ -21,12 +21,11 @@
 
 #include <memory>
 #include <new>
-#include <testsuite_hooks.h>
 
 struct A
 {
-    void* operator new(size_t n) { return new char[sizeof(A)]; }
-    void operator delete(void* p, size_t) { delete (char*)p; }
+  void* operator new(size_t n) { return new char[sizeof(A)]; }
+  void operator delete(void* p, size_t) { delete (char*)p; }
 };
 
 // 20.6.6.2.6 shared_ptr creation [util.smartptr.shared.create]
@@ -34,8 +33,6 @@ struct A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p = std::make_shared<A>();
 }
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr925.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr925.cc
index 18593161..75302ca 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr925.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr925.cc
@@ -42,8 +42,6 @@ create_auto_ptr()
 void 
 process(std::shared_ptr<A> a)
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( a.get() != 0 );
   VERIFY( a.use_count() == 1 );
 }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/make.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/make.cc
index 3a0e00b..79259ce 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/make.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/make.cc
@@ -51,7 +51,6 @@ struct reset_count_struct
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   {
@@ -66,7 +65,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   reset_count_struct __attribute__((unused)) reset;
 
   std::shared_ptr<A> p1;
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/dest/dest.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/dest/dest.cc
index bd682dc..9a2ef65 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/dest/dest.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/dest/dest.cc
@@ -69,7 +69,6 @@ int
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   {
     std::shared_ptr<A> a;
@@ -88,7 +87,6 @@ int
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::shared_ptr<A> a;
   {
@@ -108,7 +106,6 @@ int
 test03()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   {
     std::shared_ptr<A> a1(new B);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/hash/1.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/hash/1.cc
index 525bc1f..66b3d65 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/hash/1.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/hash/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   struct T { };
 
   std::shared_ptr<T>                s0(new T);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/24595.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/24595.cc
index 90090f1..1740140 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/24595.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/24595.cc
@@ -27,8 +27,6 @@ using std::get_deleter;
 // libstdc++/24595
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<int> sp;
   VERIFY( !get_deleter<void(*)(int*)>(sp) );
 }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/42019.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/42019.cc
index 242e2b7..e6633d1 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/42019.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/42019.cc
@@ -34,8 +34,6 @@ struct B {
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> spA = std::make_shared<A>();
 
   VERIFY( spA.get() != 0 );
@@ -43,8 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<B> spB = std::make_shared<B>(99);
 
   VERIFY( spB->i == 99 );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/io.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/io.cc
index d30b901..7e2e4db 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/io.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/io.cc
@@ -31,8 +31,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p(new A);
   std::ostringstream buf;
   buf << p;
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/swap.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/swap.cc
index 35fe12d..de26276 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/misc/swap.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/misc/swap.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a1 = new A;
   A * const a2 = new A;
   std::shared_ptr<A> p1(a1);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset.cc
index 550e28b..d80314e 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset.cc
@@ -37,8 +37,6 @@ long D::delete_count = 0;
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   std::shared_ptr<A> p1(a);
   std::shared_ptr<A> p2(p1);
@@ -52,8 +50,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   B * const b = new B;
   std::shared_ptr<A> p1(a);
@@ -68,8 +64,6 @@ test02()
 int
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::shared_ptr<A> p1;
     p1.reset(new B, D());
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_alloc.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_alloc.cc
index 6e754c8..46aefce 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_alloc.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_alloc.cc
@@ -41,7 +41,6 @@ long D::delete_count = 0;
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
   tracker_allocator_counter::reset();
 
   {
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_neg.cc
index e28a966..0b31282 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/reset_neg.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::shared_ptr<A> p1(new A);
   p1.reset();     // { dg-error "" }
 
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap.cc
index e47cc67..f84a3da 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a1 = new A;
   A * const a2 = new A;
   std::shared_ptr<A> p1(a1);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap_neg.cc
index c1b8cb2..935582f 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/modifiers/swap_neg.cc
@@ -30,8 +30,6 @@ struct A { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::shared_ptr<A> p1(new A);
   std::shared_ptr<A> p2(new A);
   p1.swap(p2);   // { dg-error "discards qualifiers" }
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/bool_conv.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/bool_conv.cc
index 4f4a1da..d6e52b9 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/bool_conv.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/bool_conv.cc
@@ -30,8 +30,6 @@ struct A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::shared_ptr<A> p1;
   VERIFY( static_cast<bool>(p1) == false );
   const std::shared_ptr<A> p2(p1);
@@ -41,8 +39,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   VERIFY( static_cast<bool>(p1) );
   std::shared_ptr<A> p2(p1);
@@ -55,8 +51,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   std::shared_ptr<A> p2(p1);
   p2.reset(new A);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/get.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/get.cc
index 266727a..966614e 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/get.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/get.cc
@@ -34,8 +34,6 @@ struct A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   const std::shared_ptr<A> p(a);
   VERIFY( p.get() == a );
@@ -45,8 +43,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   const std::shared_ptr<A> p(a);
   VERIFY( &*p == a );
@@ -56,8 +52,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   A * const a = new A;
   const std::shared_ptr<A> p(a);
   VERIFY( &p->i == &a->i );
@@ -66,8 +60,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
 #if !(defined _GLIBCXX_DEBUG && defined _GLIBCXX_DEBUG_PEDANTIC)
   std::shared_ptr<int> p;
   auto np = p.operator->();
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/owner_before.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/owner_before.cc
index 0874a00..eb88ae0 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/owner_before.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/owner_before.cc
@@ -37,8 +37,6 @@ struct B : A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // test empty shared_ptrs compare equivalent
   std::shared_ptr<A> p1;
   std::shared_ptr<B> p2;
@@ -50,8 +48,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a0;
 
   std::shared_ptr<A> a1(new A);
@@ -77,8 +73,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A());
   std::shared_ptr<int> p2(p1, &p1->i);
   VERIFY( !p1.owner_before(p2) && !p2.owner_before(p1) );
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/unique.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/unique.cc
index a57cc08..a12ee3c 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/unique.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/unique.cc
@@ -30,8 +30,6 @@ struct A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::shared_ptr<A> p1;
   VERIFY( !p1.unique() );
   const std::shared_ptr<A> p2(p1);
@@ -41,8 +39,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   VERIFY( p1.unique() );
   std::shared_ptr<A> p2(p1);
@@ -55,8 +51,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   std::shared_ptr<A> p2(p1);
   p2.reset(new A);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/use_count.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/use_count.cc
index 10f5ab3..c022a5a 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/observers/use_count.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/observers/use_count.cc
@@ -31,8 +31,6 @@ struct B : A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::shared_ptr<A> p1;
   VERIFY( p1.use_count() == 0 );
   const std::shared_ptr<A> p2(p1);
@@ -42,8 +40,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   std::shared_ptr<A> p2(p1);
   p1.reset();
@@ -54,8 +50,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> p1(new A);
   std::shared_ptr<A> p2(p1);
   p2.reset(new B);
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
index 6708496..5014898 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
@@ -124,7 +124,6 @@ void thread_hammer(wp_vector_t& weak_pool)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   sp_vector_t obj_pool(POOL_SIZE);
   
   for(auto& obj : obj_pool)
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
index 84dfcec..eaa72c4 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
@@ -126,7 +126,6 @@ void thread_hammer(wp_vector_t& weak_pool)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   sp_vector_t obj_pool(POOL_SIZE);
   
   for(auto& obj : obj_pool)
diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc
index efb311d..610f1fa 100644
--- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc
+++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc
@@ -36,8 +36,6 @@ typedef test_container<rvalstruct, forward_iterator_wrapper> container_out;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int inarray[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
   const int size = sizeof(inarray) / sizeof(int);
 
diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc
index 9420bdc..7d7a343 100644
--- a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc
+++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc
@@ -38,8 +38,6 @@ typedef test_container<rvalstruct, forward_iterator_wrapper> container_out;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int inarray[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
   const int size = sizeof(inarray) / sizeof(int);
 
diff --git a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
index a7002c5..a9e4a9d 100644
--- a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
+++ b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc
@@ -26,8 +26,6 @@ struct junk { char j[12]; };
 
 int main(void)
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::pair<junk*, std::ptrdiff_t> pair_type;
   pair_type results = std::get_temporary_buffer<junk>(5);
 
diff --git a/libstdc++-v3/testsuite/20_util/time_point/1.cc b/libstdc++-v3/testsuite/20_util/time_point/1.cc
index 59d0f7f..b358818 100644
--- a/libstdc++-v3/testsuite/20_util/time_point/1.cc
+++ b/libstdc++-v3/testsuite/20_util/time_point/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   time_point<system_clock> t1;
diff --git a/libstdc++-v3/testsuite/20_util/time_point/2.cc b/libstdc++-v3/testsuite/20_util/time_point/2.cc
index c0b6f1b..7704b9f 100644
--- a/libstdc++-v3/testsuite/20_util/time_point/2.cc
+++ b/libstdc++-v3/testsuite/20_util/time_point/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   time_point<system_clock> t1, t2;
@@ -42,7 +41,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   time_point<system_clock> t1;
diff --git a/libstdc++-v3/testsuite/20_util/time_point/3.cc b/libstdc++-v3/testsuite/20_util/time_point/3.cc
index 3150fdf..8727016 100644
--- a/libstdc++-v3/testsuite/20_util/time_point/3.cc
+++ b/libstdc++-v3/testsuite/20_util/time_point/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   time_point<system_clock> t1(seconds(1));
diff --git a/libstdc++-v3/testsuite/20_util/time_point/nonmember/constexpr.cc b/libstdc++-v3/testsuite/20_util/time_point/nonmember/constexpr.cc
index ce8b3a4..f4803ca 100644
--- a/libstdc++-v3/testsuite/20_util/time_point/nonmember/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/time_point/nonmember/constexpr.cc
@@ -22,7 +22,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std::chrono;
   
   typedef time_point<system_clock> time_type;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/48476.cc b/libstdc++-v3/testsuite/20_util/tuple/48476.cc
index 3ea01f1..394e216 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/48476.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/48476.cc
@@ -29,8 +29,6 @@ template<typename T>
 // libstdc++/48476
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<int> p(new int()), q, r;
   
   std::tuple<std::shared_ptr<int>&, int>  t0(p, 23), t1(q, 0);
diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/comparisons.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/comparisons.cc
index 4c4f6f8..129e01a 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/comparisons.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/comparisons.cc
@@ -24,8 +24,6 @@
 
 using namespace std;
 
-bool test __attribute__((unused)) = true;
-
 #define TEST1(x) VERIFY( x == x && !(x != x) && x <= x && !(x < x) )
 
 int
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/allocators.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/allocators.cc
index f1b033b..45e6772 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cons/allocators.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/allocators.cc
@@ -102,7 +102,6 @@ struct UsesWithoutTag
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::allocator_arg;
   using std::tuple;
   using std::make_tuple;
@@ -164,7 +163,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using std::allocator_arg;
   using std::tuple;
   using std::make_tuple;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/assignment.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/assignment.cc
index 6612c7f..9a8eb61 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cons/assignment.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/assignment.cc
@@ -27,8 +27,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   tuple<> ta;
   tuple<> tb;
   ta = tb;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/big_tuples.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/big_tuples.cc
index fbde7df..13833e7 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cons/big_tuples.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/big_tuples.cc
@@ -32,8 +32,6 @@ struct foo
 void
 test_constructors()
 {
-  bool test __attribute__((unused)) = true;
-
   int x1=0,x2=0;
   const int &z1=x1;
 
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/constructor.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/constructor.cc
index edfa706..dd64ef5 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cons/constructor.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/constructor.cc
@@ -28,8 +28,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   int x1=0,x2=0;
   const int &z1=x1;
 
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/23978.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/23978.cc
index 561aa8c..98f2fae 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/23978.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/23978.cc
@@ -28,8 +28,6 @@ using namespace std;
 // libstdc++/23978
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   pair<int, int> p(1, 2);
   int x = 0;
   int y = 0;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/48476.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/48476.cc
index 9ac0fda..4238b4e 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/48476.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/48476.cc
@@ -29,8 +29,6 @@ template<typename... Args1, typename... Args2>
   void
   check_tuple_cat(std::tuple<Args1...> t1, std::tuple<Args2...> t2)
   {
-    bool test __attribute__((unused)) = true;
-
     typedef std::tuple<Args1..., Args2...> concatenated;
   
     auto cat1 = std::tuple_cat(     t1,       t2 );
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/constexpr.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/constexpr.cc
index 5815543..86b5abb 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/constexpr.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/constexpr.cc
@@ -24,9 +24,6 @@
 
 #include <tuple>
 
-bool test __attribute__((unused)) = true;
-
-
 // make_tuple
 void
 test_make_tuple()
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/forward_as_tuple.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/forward_as_tuple.cc
index 747b8d3..b106741 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/forward_as_tuple.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/forward_as_tuple.cc
@@ -28,8 +28,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_as_tuple();
 
   VERIFY( std::get<0>(std::forward_as_tuple(-1)) == -1 );
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/make_tuple.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/make_tuple.cc
index ab855ca..ad7f6ef 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/make_tuple.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/make_tuple.cc
@@ -28,8 +28,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   int i=0;
   make_tuple(1,2,4.0);
   make_tuple(ref(i)) = tuple<int>(1);
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie.cc
index d1cfc62..3a60f2c 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie.cc
@@ -27,8 +27,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true; 
-
   int x1 = 0;
   int x2 = 0;
   int y1 = 0;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie2.cc b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie2.cc
index 39cebfe..97c5810 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie2.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/creation_functions/tie2.cc
@@ -26,7 +26,6 @@
 int
 main()
 {
-  bool test __attribute__((unused)) = true; 
   using namespace std;
 
   int i;
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cv_tuple_size.cc b/libstdc++-v3/testsuite/20_util/tuple/cv_tuple_size.cc
index ef45f0b..df5e0e9 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cv_tuple_size.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cv_tuple_size.cc
@@ -25,7 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   VERIFY( tuple_size<const tuple<> >::value == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/tuple/element_access/get.cc b/libstdc++-v3/testsuite/20_util/tuple/element_access/get.cc
index f0bcf22..0b2b3d6 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/element_access/get.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/element_access/get.cc
@@ -27,8 +27,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   int j=1;
   const int k=2;
   tuple<int,int &,const int&> a(0,j,k);
diff --git a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_by_type.cc b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_by_type.cc
index b1f7a04..e02e9f5 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_by_type.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_by_type.cc
@@ -27,8 +27,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   int j=1;
   const int k=2;
   tuple<int,int &,const int&> a(0,j,k);
diff --git a/libstdc++-v3/testsuite/20_util/tuple/moveable.cc b/libstdc++-v3/testsuite/20_util/tuple/moveable.cc
index d4b93c5..ed88361 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/moveable.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::tuple<int, double> a(1, 2.0), b;
   b = std::move(a);
   VERIFY( std::get<0>(b) == 1 && std::get<1>(b) == 2.0 );
diff --git a/libstdc++-v3/testsuite/20_util/tuple/swap.cc b/libstdc++-v3/testsuite/20_util/tuple/swap.cc
index a95eaf9..6e260c4 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/swap.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/swap.cc
@@ -56,8 +56,6 @@ make_move_only (int i)
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::tuple<> t1, t2;
   std::swap(t1, t2);
 
@@ -66,8 +64,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::tuple<int> t1(1), t2(2);
   std::swap(t1, t2);
   
@@ -76,8 +72,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::tuple<int, float> t1(1, 1.0f), t2(2, 2.0f);
   std::swap(t1, t2);
 
@@ -87,8 +81,6 @@ void test03()
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::tuple<int, float, MoveOnly> 
     t1(1, 1.0f, make_move_only(1)), 
     t2(2, 2.0f, make_move_only(2));
diff --git a/libstdc++-v3/testsuite/20_util/tuple/tuple_size.cc b/libstdc++-v3/testsuite/20_util/tuple/tuple_size.cc
index e1106ce..14b623d 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/tuple_size.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/tuple_size.cc
@@ -27,8 +27,6 @@ using namespace std;
 int
 main()
 {
-  bool test __attribute__((unused)) = true;
-
   static_assert(tuple_size<tuple<>>::value == 0, "");
   static_assert(tuple_size<tuple<int>>::value == 1, "");
   static_assert(tuple_size<tuple<void>>::value == 1, "");
diff --git a/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators.cc b/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators.cc
index 02aba25..bef65ff 100644
--- a/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators.cc
+++ b/libstdc++-v3/testsuite/20_util/typeindex/comparison_operators.cc
@@ -50,7 +50,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   class Abraca { };
diff --git a/libstdc++-v3/testsuite/20_util/typeindex/hash.cc b/libstdc++-v3/testsuite/20_util/typeindex/hash.cc
index f2440af..56a38a1 100644
--- a/libstdc++-v3/testsuite/20_util/typeindex/hash.cc
+++ b/libstdc++-v3/testsuite/20_util/typeindex/hash.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   class Abraca { };
diff --git a/libstdc++-v3/testsuite/20_util/typeindex/hash_code.cc b/libstdc++-v3/testsuite/20_util/typeindex/hash_code.cc
index 4bb9662..1f9f9e5 100644
--- a/libstdc++-v3/testsuite/20_util/typeindex/hash_code.cc
+++ b/libstdc++-v3/testsuite/20_util/typeindex/hash_code.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   class Abraca { };
diff --git a/libstdc++-v3/testsuite/20_util/typeindex/name.cc b/libstdc++-v3/testsuite/20_util/typeindex/name.cc
index b43d712..db80b3d 100644
--- a/libstdc++-v3/testsuite/20_util/typeindex/name.cc
+++ b/libstdc++-v3/testsuite/20_util/typeindex/name.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   class Abraca { };
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc
index 9c1e535..935848c 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635.cc
@@ -29,7 +29,6 @@ struct Deleter
   Deleter&
   operator=(const Deleter&)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( true );
     return *this;
   }
@@ -37,7 +36,6 @@ struct Deleter
   Deleter&
   operator=(Deleter&&)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( false );
     return *this;
   }
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move.cc
index d329fa9..0edd5f3 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move.cc
@@ -28,8 +28,6 @@ struct D : public B {};
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   D *d = new D;
   std::unique_ptr<D> p1(d);
   std::unique_ptr<D> p2(new D);
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move_array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move_array.cc
index c11d757..5c06bc0 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move_array.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/move_array.cc
@@ -28,8 +28,6 @@ struct D : public B {};
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   D *d = new D[3];
   std::unique_ptr<D[]> p1(d);
   std::unique_ptr<D[]> p2;
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/nullptr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/nullptr.cc
index 35853dc..5825f96 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/nullptr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/nullptr.cc
@@ -27,8 +27,6 @@ struct A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A> p(new A);
   p = nullptr;
 
@@ -38,8 +36,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A[]> p(new A[2]);
   p = nullptr;
 
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr.cc
index 158893f..605f8ba 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/auto_ptr.cc
@@ -31,8 +31,6 @@ struct A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::auto_ptr<A> a(new A);
   std::unique_ptr<A> a2(std::move(a));
   VERIFY( a.get() == nullptr );
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/nullptr.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/nullptr.cc
index f46ac33..4b80746 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/nullptr.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/nullptr.cc
@@ -27,8 +27,6 @@ struct A { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A> p = nullptr;
 
   VERIFY( p.get() == nullptr );
@@ -37,8 +35,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A[]> p = nullptr;
 
   VERIFY( p.get() == nullptr );
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer.cc
index 9485930..91135ae 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer.cc
@@ -61,7 +61,6 @@ void
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::unique_ptr<A> A_default;
   VERIFY( A_default.get() == 0 );
@@ -89,7 +88,6 @@ void
 test02()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   A * const A_default = 0;
   std::unique_ptr<A> p1(A_default);
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array.cc
index 911ca54..5305e77 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array.cc
@@ -60,7 +60,6 @@ void
 test01()
 {
   reset_count_struct __attribute__((unused)) reset;
-  bool test __attribute__((unused)) = true;
 
   std::unique_ptr<A[]> A_default;
   VERIFY( A_default.get() == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter.cc
index 31a1d92..2b3373e 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/ptr_deleter.cc
@@ -30,7 +30,6 @@ void vdel(int* p) { ++count; delete[] p; }
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   count = 0;
   {
     std::unique_ptr<int, void(*)(int*)> p(nullptr, del);
@@ -45,7 +44,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   count = 0;
   {
     std::unique_ptr<int[], void(*)(int*)> p(nullptr, vdel);
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc
index cbfa289..b47261e 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/array.cc
@@ -32,8 +32,6 @@ struct A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A[]> a = std::make_unique<A[]>(3);
   VERIFY( a != nullptr );
   VERIFY( a[0].b && a[1].b && a[2].b );
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc
index 45c6ab2..dc7d667 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/single.cc
@@ -32,8 +32,6 @@ struct A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int i = 0;
   double d = 0;
   char c = 0;
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/hash/1.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/hash/1.cc
index dd5570e..6fc4fdc 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/hash/1.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/hash/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   struct T { };
 
   std::unique_ptr<T>                                 u0(new T);
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/43183.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/43183.cc
index 9747a10..1461efa 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/43183.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/43183.cc
@@ -36,8 +36,6 @@ int D::count = 0;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<int, D> up;
   up.reset();
   VERIFY( D::count == 0 );
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons.cc
index b3a5805..74cbc87 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons.cc
@@ -36,8 +36,6 @@ struct B : A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A> p1;
   std::unique_ptr<A> p2;
 
@@ -49,8 +47,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::unique_ptr<A> p1;
   std::unique_ptr<A> p2(new A);
 
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons_array.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons_array.cc
index f434b1f..c5c4400 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons_array.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/comparisons_array.cc
@@ -36,8 +36,6 @@ struct B : A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique_ptr<A[]> p1;
   std::unique_ptr<A[]> p2;
 
@@ -49,8 +47,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::unique_ptr<A[]> p1;
   std::unique_ptr<A[]> p2(new A[3]);
 
diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap.cc
index 67040d4..521b34c 100644
--- a/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap.cc
+++ b/libstdc++-v3/testsuite/20_util/unique_ptr/specialized_algorithms/swap.cc
@@ -27,8 +27,6 @@ struct A {};
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
- 
   std::unique_ptr<A> p1;
   std::unique_ptr<A> p2(new A);
   std::unique_ptr<A> p3;
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/construction.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/construction.cc
index d5b5474..9ac4589 100644
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/construction.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/construction.cc
@@ -91,8 +91,6 @@ template<typename TestType, typename... T>
 template<typename... T>
   void test(T... args)
   {
-    bool test __attribute__((unused)) = true;
-
     VERIFY( test2<CannotUse>(args...) );
     VERIFY( test2<DoesNotUse>(args...) );
     VERIFY( test2<UsesWithTag>(args...) );
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/value.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/value.cc
index 8202b51..46fc72f 100644
--- a/libstdc++-v3/testsuite/20_util/uses_allocator/value.cc
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/value.cc
@@ -38,7 +38,6 @@ struct UD { typedef MyDerivedAlloc  allocator_type; };
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::uses_allocator;
   using namespace __gnu_test;
 
diff --git a/libstdc++-v3/testsuite/20_util/variant/run.cc b/libstdc++-v3/testsuite/20_util/variant/run.cc
index cbe3b17..3a95222 100644
--- a/libstdc++-v3/testsuite/20_util/variant/run.cc
+++ b/libstdc++-v3/testsuite/20_util/variant/run.cc
@@ -51,16 +51,12 @@ struct AlwaysThrow
 
 void default_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<monostate, string> v;
   VERIFY(holds_alternative<monostate>(v));
 }
 
 void copy_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<monostate, string> v("a");
   VERIFY(holds_alternative<string>(v));
   variant<monostate, string> u(v);
@@ -70,8 +66,6 @@ void copy_ctor()
 
 void move_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<monostate, string> v("a");
   VERIFY(holds_alternative<string>(v));
   variant<monostate, string> u(std::move(v));
@@ -82,8 +76,6 @@ void move_ctor()
 
 void arbitrary_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<int, string> v("a");
   VERIFY(holds_alternative<string>(v));
   VERIFY(get<1>(v) == "a");
@@ -91,8 +83,6 @@ void arbitrary_ctor()
 
 void copy_assign()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<monostate, string> v("a");
   VERIFY(holds_alternative<string>(v));
   variant<monostate, string> u;
@@ -103,8 +93,6 @@ void copy_assign()
 
 void move_assign()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<monostate, string> v("a");
   VERIFY(holds_alternative<string>(v));
   variant<monostate, string> u;
@@ -116,8 +104,6 @@ void move_assign()
 
 void arbitrary_assign()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<int, string> v;
   v = "a";
 
@@ -127,8 +113,6 @@ void arbitrary_assign()
 
 void dtor()
 {
-  bool test [[gnu::unused]] = true;
-
   struct A {
       A(int& called) : called(called) {}
       ~A() {
@@ -150,8 +134,6 @@ void dtor()
 
 void in_place_index_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   {
     variant<int, string> v(in_place<1>, "a");
     VERIFY(holds_alternative<string>(v));
@@ -166,8 +148,6 @@ void in_place_index_ctor()
 
 void in_place_type_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   {
     variant<int, string> v(in_place<string>, "a");
     VERIFY(holds_alternative<string>(v));
@@ -206,8 +186,6 @@ namespace std
 
 void uses_allocator_ctor()
 {
-  bool test [[gnu::unused]] = true;
-
   std::allocator<char> a;
   variant<UsesAllocatable> v(std::allocator_arg, a);
   VERIFY(get<0>(v).d == 0);
@@ -226,8 +204,6 @@ void uses_allocator_ctor()
 
 void emplace()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<int, string> v;
   v.emplace<0>(1);
   VERIFY(get<0>(v) == 1);
@@ -252,8 +228,6 @@ void emplace()
 
 void test_get()
 {
-  bool test [[gnu::unused]] = true;
-
   VERIFY(get<1>(variant<int, string>("a")) == "a");
   VERIFY(get<string>(variant<int, string>("a")) == "a");
   {
@@ -286,8 +260,6 @@ void test_get()
 
 void test_relational()
 {
-  bool test [[gnu::unused]] = true;
-
   VERIFY((variant<int, string>(2) < variant<int, string>(3)));
   VERIFY((variant<int, string>(3) == variant<int, string>(3)));
   VERIFY((variant<int, string>(3) > variant<int, string>(2)));
@@ -303,8 +275,6 @@ void test_relational()
 
 void test_swap()
 {
-  bool test [[gnu::unused]] = true;
-
   variant<int, string> a("a"), b("b");
   a.swap(b);
   VERIFY(get<1>(a) == "b");
@@ -316,8 +286,6 @@ void test_swap()
 
 void test_visit()
 {
-  bool test [[gnu::unused]] = true;
-
   {
     struct Visitor
     {
@@ -383,8 +351,6 @@ void test_visit()
 
 void test_hash()
 {
-  bool test [[gnu::unused]] = true;
-
   unordered_set<variant<int, string>> s;
   VERIFY(s.emplace(3).second);
   VERIFY(s.emplace("asdf").second);
@@ -419,8 +385,6 @@ void test_hash()
 
 void test_valueless_by_exception()
 {
-  bool test [[gnu::unused]] = true;
-
   {
     AlwaysThrow a;
     bool caught = false;
diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/observers/owner_before.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/observers/owner_before.cc
index 3974ba8..fd1f162 100644
--- a/libstdc++-v3/testsuite/20_util/weak_ptr/observers/owner_before.cc
+++ b/libstdc++-v3/testsuite/20_util/weak_ptr/observers/owner_before.cc
@@ -30,8 +30,6 @@ struct B { };
 int
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // test empty weak_ptrs compare equivalent
   std::weak_ptr<A> p1;
   std::weak_ptr<B> p2;
@@ -47,8 +45,6 @@ test01()
 int
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::shared_ptr<A> a0;
   std::weak_ptr<A> w0(a0);
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy.cc
index 67a1727..6871acd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -48,7 +47,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +64,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy_assign.cc
index c70cee3..5ab737a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/copy_assign.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +65,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move.cc
index 7028678..a4291f9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move.cc
@@ -30,7 +30,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<C> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<C> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move_assign.cc
index ff4b147..9d08f9d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/move_assign.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
@@ -69,7 +68,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
@@ -108,7 +106,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/swap.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/swap.cc
index 7d5d8b9..fcee8ec 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/swap.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/swap.cc
@@ -47,7 +47,6 @@ operator!=(const propagating_allocator<C, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,7 +62,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
index 57baf3b..6bb3086 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -48,7 +47,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +64,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
index 4cfb543..7b7372a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/copy_assign.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +65,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
index 4124f44..376a64a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move.cc
@@ -30,7 +30,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<C> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<C> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
index bb93b15..a8be777 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/move_assign.cc
@@ -30,7 +30,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
@@ -69,7 +68,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
@@ -108,7 +106,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
index d56517e..24c1669 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/swap.cc
@@ -47,7 +47,6 @@ operator!=(const propagating_allocator<C, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, false> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,7 +62,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<C, true> alloc_type;
   typedef std::basic_string<C, traits, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
index d7e5eae..2aad99c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
@@ -125,8 +125,6 @@ namespace std
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // non POD types : resize, capacity, reserve
   std::basic_string< A<B> > str02;
   typedef std::basic_string< A<B> >::size_type size_type_o;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/1.cc
index 111585f..a22d4a3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/1.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   // POD types : resize, capacity, reserve
-  bool test __attribute__((unused)) = true;
   std::string str01;
   typedef std::string::size_type size_type_s;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
index 78ae9e8..7558534 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
@@ -32,7 +32,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef string::size_type size_type;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/2.cc
index bc5b96c..95d9a67 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/2.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2001-11/msg00150.html
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str01 = "twelve chars";
   // str01 becomes shared
   std::string str02 = str01;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc
index d648d9d..609ea4c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc
@@ -25,8 +25,6 @@
 // libstdc++/42573
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string s(100, 'a');
   s.push_back('b');
   s.push_back('b');
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/1.cc
index e41d998..7542855 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/1.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   // POD types : resize, capacity, reserve
-  bool test __attribute__((unused)) = true;
   std::wstring str01;
   typedef std::wstring::size_type size_type_s;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
index c665153..d249f22 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
@@ -32,7 +32,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef wstring::size_type size_type;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/2.cc
index 7dac3d5..9207e5b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/2.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2001-11/msg00150.html
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str01 = L"twelve chars";
   // str01 becomes shared
   std::wstring str02 = str01;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc
index 1c6a880..fa28400 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc
@@ -25,8 +25,6 @@
 // libstdc++/42573
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring s(100, L'a');
   s.push_back(L'b');
   s.push_back(L'b');
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc
index 48d74b6..9d04df6 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc
@@ -26,7 +26,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::iterator citerator;
   csize_type npos = std::string::npos;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/2.cc
index c836c33..b2ae7a0 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/2.cc
@@ -24,8 +24,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   // template<typename _InputIter>
   //   basic_string(_InputIter begin, _InputIter end, const allocator& a)
   // where _InputIter is integral [21.3.1 para 15]
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/3.cc
index 8bd7f60..dfb9f21 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/3.cc
@@ -26,7 +26,6 @@
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   const char* with_nulls = "This contains \0 a zero byte.";
 
   // These are tests to see how basic_string handles data with NUL
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/4.cc
index 18930d9..b25ebea 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/4.cc
@@ -25,8 +25,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2002-06/msg00025.html
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str01("portofino");
 
   std::string::reverse_iterator i1 = str01.rbegin();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc
index 3548214..6edcd8a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/42261.cc
@@ -21,7 +21,6 @@
 // libstdc++/42261
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const string s(string::size_type(6), string::size_type('f'));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc
index 8f3992c..2262d21 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/5.cc
@@ -26,8 +26,6 @@
 // libstdc++/8347
 void test05()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<char> empty;
   std::string empty2(empty.begin(), empty.end());
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/6.cc
index 88e94b5..9c0932c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/6.cc
@@ -36,8 +36,6 @@ string data(long len)
 
 void test01(int iter)
 {
-  bool test __attribute__((unused)) = true;
-
   for (long i = 0, j = 1; i < iter; ++i, j *= 3)
     {
       istringstream isstr(data(j));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/7.cc
index 181ef7e..a7f575f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/7.cc
@@ -24,8 +24,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string_view s("foo");
   std::string s2(s);
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/8.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/8.cc
index 6534f76..64475d0 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/8.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/8.cc
@@ -30,8 +30,6 @@ construct(Args&&... args)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using string = std::string;
   using list = std::initializer_list<string::value_type>;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc
index 86f8f25..e3ed5e8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string a, b;
   a.push_back('1');
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc
index 98d56b0..84442eb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2.cc
@@ -37,8 +37,6 @@ public:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   tstring a, b;
   a.push_back('1');
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc
index 1deeb8c..8b10a0e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc
@@ -26,7 +26,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::iterator citerator;
   csize_type npos = std::wstring::npos;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/2.cc
index 8980863..1772022 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/2.cc
@@ -24,8 +24,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   // template<typename _InputIter>
   //   basic_string(_InputIter begin, _InputIter end, const allocator& a)
   // where _InputIter is integral [21.3.1 para 15]
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/3.cc
index b838968..6d2c2ed 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/3.cc
@@ -26,7 +26,6 @@
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* with_nulls = L"This contains \0 a zero byte.";
 
   // These are tests to see how basic_string handles data with NUL
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/4.cc
index 9bad10d..40a481d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/4.cc
@@ -25,8 +25,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2002-06/msg00025.html
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str01(L"portofino");
 
   std::wstring::reverse_iterator i1 = str01.rbegin();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc
index 6d57647..ca21473 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/42261.cc
@@ -21,7 +21,6 @@
 // libstdc++/42261
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const wstring s(wstring::size_type(6), wstring::size_type(L'f'));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc
index 5c4e5b4..7dfd76e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/5.cc
@@ -26,8 +26,6 @@
 // libstdc++/8347
 void test05()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<wchar_t> empty;
   std::wstring empty2(empty.begin(), empty.end());
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
index 3f677a0..4c37360 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
@@ -42,8 +42,6 @@ wstring data(long len)
 
 void test01(int iter)
 {
-  bool test __attribute__((unused)) = true;
-
   for (long i = 0, j = 1; i < iter; ++i, j *= 3)
     {
       wistringstream isstr(data(j));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/7.cc
index f037e53..33ce39e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/7.cc
@@ -24,8 +24,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring_view s(L"foo");
   std::wstring s2(s);
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/8.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/8.cc
index 9152ad9..146ba2d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/8.cc
@@ -30,8 +30,6 @@ construct(Args&&... args)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using string = std::wstring;
   using list = std::initializer_list<string::value_type>;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc
index 38e93f5..2f2ca4c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring a, b;
   a.push_back(L'1');
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc
index 3bfed12..cfd3930 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2.cc
@@ -37,8 +37,6 @@ public:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   twstring a, b;
   a.push_back(L'1');
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/1.cc
index 515e112..0d41494 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -78,7 +77,6 @@ bool test01(void)
   catch(...) {
     VERIFY( false );
   }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/2.cc
index 9222c25..c643616 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/2.cc
@@ -26,9 +26,8 @@
 // Do a quick sanity check on known problems with element access and
 // ref-counted strings. These should all pass, regardless of the
 // underlying string implementation, of course.
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::iterator siterator;
   typedef std::string::reverse_iterator sriterator;
@@ -100,7 +99,6 @@ bool test01(void)
   VERIFY( str03[0] == 'x' );
 
   // need to also test for const begin/const end
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/3.cc
index dbdd6da..1347607 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/3.cc
@@ -25,9 +25,8 @@
 
 // Do another sanity check, this time for member functions that return
 // iterators, namely insert and erase.
-bool test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::iterator siterator;
   typedef std::string::reverse_iterator sriterator;
@@ -73,7 +72,6 @@ bool test02(void)
   std::string str13 = str12;
   *p2 = 'e';
   VERIFY( str12 != str13 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/4.cc
index 8c83012..dc8f50f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/4.cc
@@ -25,7 +25,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-01/msg00184.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   for (int i = 0; i < 2000; ++i)
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/58163.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/58163.cc
index d5a4c01..c2ea0fa 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/58163.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/58163.cc
@@ -24,8 +24,6 @@
 // PR c++/58163
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string cs;
         std::string  s;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/empty.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/empty.cc
index dfe7ce0..bedc4d3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/empty.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/empty.cc
@@ -22,8 +22,6 @@
 // as per 21.3.4
 int main()
 {
-  bool test __attribute__((unused)) = true;
-  
   {
     std::string empty;
     char c = empty[0];
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/front_back.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/front_back.cc
index 1ecd3e9..8761cb2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/front_back.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/front_back.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str("ramifications");
   const std::string cstr("melodien");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/1.cc
index a243cf8..bdaef85 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -78,7 +77,6 @@ bool test01(void)
   catch(...) {
     VERIFY( false );
   }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/2.cc
index 8f843de..2f93dbf 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/2.cc
@@ -26,9 +26,8 @@
 // Do a quick sanity check on known problems with element access and
 // ref-counted strings. These should all pass, regardless of the
 // underlying string implementation, of course.
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::iterator siterator;
   typedef std::wstring::reverse_iterator sriterator;
@@ -100,8 +99,6 @@ bool test01(void)
   VERIFY( str03[0] == L'x' );
 
   // need to also test for const begin/const end
-  VERIFY(test);
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/3.cc
index c78eed5..5a1e4fd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/3.cc
@@ -25,9 +25,8 @@
 
 // Do another sanity check, this time for member functions that return
 // iterators, namely insert and erase.
-bool test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::iterator siterator;
   typedef std::wstring::reverse_iterator sriterator;
@@ -73,7 +72,6 @@ bool test02(void)
   std::wstring str13 = str12;
   *p2 = L'e';
   VERIFY( str12 != str13 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/4.cc
index 28b1159..f4a9b92 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/4.cc
@@ -25,7 +25,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-01/msg00184.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   for (int i = 0; i < 2000; ++i)
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/58163.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/58163.cc
index cbf588a..749fd49 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/58163.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/58163.cc
@@ -24,8 +24,6 @@
 // PR c++/58163
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring cs;
         std::wstring  s;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/empty.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/empty.cc
index cf3d9c3..11b8d32 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/empty.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/empty.cc
@@ -22,8 +22,6 @@
 // as per 21.3.4
 int main()
 {
-  bool test __attribute__((unused)) = true;
-  
   {
     std::wstring empty;
     wchar_t c = empty[0];
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/front_back.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/front_back.cc
index ba4aa09..d73dc95 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/front_back.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/front_back.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str(L"ramifications");
   const std::wstring cstr(L"melodien");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/init-list.cc b/libstdc++-v3/testsuite/21_strings/basic_string/init-list.cc
index a36ccf4..1295d3c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/init-list.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01(void)
+void test01(void)
 {
-  bool test = true;
-
   string s1 = { 'a', 'b', 'c' };
   VERIFY(s1 == "abc");
 
@@ -60,8 +58,6 @@ int test01(void)
   i2 = i1+6;
   s1.replace(i1, i2, { 'y', 'z' });
   VERIFY(s1 == "mnyzo");
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/1.cc
index 21a67fa..9d49db9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/1.cc
@@ -30,9 +30,8 @@
 #include <iostream>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -154,7 +153,6 @@ bool test01(void)
   
   std::string hello_world;
   std::cout << hello_world;
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/10.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/10.cc
index 1f11433..ed2a34e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/10.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/10.cc
@@ -42,8 +42,6 @@ string prepare(string::size_type len, unsigned nchunks, char delim)
 
 void check(istream& stream, const string& str, unsigned nchunks, char delim)
 {
-  bool test __attribute__((unused)) = true;
-
   string chunk;
   string::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/11.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/11.cc
index 3e2ac0a..484194c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/11.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/11.cc
@@ -42,8 +42,6 @@ string prepare(string::size_type len, unsigned nchunks)
 
 void check(istream& stream, const string& str, unsigned nchunks)
 {
-  bool test __attribute__((unused)) = true;
-
   string chunk;
   string::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc
index e5f8794a..33cb0bf 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   ostringstream oss_01;
   const string str_01(50, 'a');
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/4.cc
index 0a7808a..394d0e1 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/4.cc
@@ -31,7 +31,6 @@
 // based on a bug report libstdc++ 9
 void test04(std::size_t size)
 {
-  bool test __attribute__((unused)) = true;
   std::string str(size, 's');
   std::size_t expected_size = 2 * (size + 1);
   std::ostringstream oss(str);
@@ -43,11 +42,11 @@ void test04(std::size_t size)
   // stress test
   oss << str << std::endl;
   if (!oss.good()) 
-    test = false;
+    VERIFY( false );
 
   oss << str << std::endl;
   if (!oss.good()) 
-    test = false;
+    VERIFY( false );
 
   VERIFY( str.size() == size );
   VERIFY( oss.good() );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/5.cc
index fad1c57..3ddae09 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/5.cc
@@ -35,7 +35,7 @@
 // mode == out
 void test05(std::size_t size)
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   const char filename[] = "inserters_extractors-1.txt";
   const char fillc = 'f';
   std::ofstream ofs(filename);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/6.cc
index 879f333..5121bb5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/6.cc
@@ -32,8 +32,6 @@
 // http://gcc.gnu.org/ml/libstdc++/1999-q4/msg00049.html
 void test06(void)
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::string::size_type size_type;
   std::string str01("@silent");
   size_type i01 = str01.size();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/7.cc
index b5eb8ea..6d49976 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/7.cc
@@ -33,7 +33,6 @@
 // NB: this is a defect in the standard.
 void test07(void)
 {
-  bool test __attribute__((unused)) = true;
   const std::string name("z6.cc");
   std::istringstream iss (name);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/8.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/8.cc
index 8810dbb..eed0284 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/8.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/8.cc
@@ -33,7 +33,6 @@ void test08()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   istringstream istrm("enero:2001");
   int 		year;
   char 		sep;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/9.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/9.cc
index 88ba5d4..3196571 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/9.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/9.cc
@@ -31,7 +31,6 @@
 // libstdc++/2830
 void test09()
 {
-  bool test __attribute__((unused)) = true;
   std::string blanks( 3, '\0');
   std::string foo = "peace";
   foo += blanks;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
index ea88545..e7e2165 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
@@ -34,8 +34,6 @@ void test01()
   typedef basic_stringbuf<pod_ushort> 	stringbuf_type;
   typedef basic_istream<pod_ushort> 	istream_type;
 
-  bool test __attribute__((unused)) = true;
-
   string_type str;
   stringbuf_type strbuf01;
   istream_type stream(&strbuf01);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
index eff9a29..cffd397 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
@@ -34,8 +34,6 @@ void test01()
   typedef basic_stringbuf<pod_ushort> 	stringbuf_type;
   typedef basic_ostream<pod_ushort> 	ostream_type;
 
-  bool test __attribute__((unused)) = true;
-
   string_type str;
   stringbuf_type strbuf01;
   ostream_type stream(&strbuf01);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/1.cc
index 7100818..3529f19 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/1.cc
@@ -30,9 +30,8 @@
 #include <iostream>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -154,7 +153,6 @@ bool test01(void)
   
   std::wstring hello_world;
   std::wcout << hello_world;
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
index 17525d3..6a43314 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
@@ -46,8 +46,6 @@ wstring prepare(wstring::size_type len, unsigned nchunks, wchar_t delim)
 
 void check(wistream& stream, const wstring& str, unsigned nchunks, wchar_t delim)
 {
-  bool test __attribute__((unused)) = true;
-
   wstring chunk;
   wstring::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
index e0bcd8a..ae1c11c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
@@ -46,8 +46,6 @@ wstring prepare(wstring::size_type len, unsigned nchunks)
 
 void check(wistream& stream, const wstring& str, unsigned nchunks)
 {
-  bool test __attribute__((unused)) = true;
-
   wstring chunk;
   wstring::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc
index 60db7ad..a6e4351 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream oss_01;
   const wstring str_01(50, L'a');
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/4.cc
index 51486b0..cbe3deb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/4.cc
@@ -31,7 +31,6 @@
 // based on a bug report libstdc++ 9
 void test04(std::size_t size)
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str(size, L's');
   std::size_t expected_size = 2 * (size + 1);
   std::wostringstream oss(str);
@@ -43,11 +42,11 @@ void test04(std::size_t size)
   // stress test
   oss << str << std::endl;
   if (!oss.good()) 
-    test = false;
+    VERIFY( false );
 
   oss << str << std::endl;
   if (!oss.good()) 
-    test = false;
+    VERIFY( false );
 
   VERIFY( str.size() == size );
   VERIFY( oss.good() );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc
index ea0a84a..a812bb7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc
@@ -33,7 +33,7 @@
 // mode == out
 void test05(std::size_t size)
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   const char filename[] = "inserters_extractors-1.txt";
   const wchar_t fillc = L'f';
   std::wofstream ofs(filename);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/6.cc
index 9e184f0..1f6dfae 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/6.cc
@@ -32,8 +32,6 @@
 // http://gcc.gnu.org/ml/libstdc++/1999-q4/msg00049.html
 void test06(void)
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::wstring::size_type size_type;
   std::wstring str01(L"@silent");
   size_type i01 = str01.size();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/7.cc
index 52087b2..12f443f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/7.cc
@@ -33,7 +33,6 @@
 // NB: this is a defect in the standard.
 void test07(void)
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring name(L"z6.cc");
   std::wistringstream iss(name);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/8.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/8.cc
index f853b2f..c205c50 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/8.cc
@@ -33,7 +33,6 @@ void test08()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   wistringstream istrm(L"enero:2001");
   int 		 year;
   wchar_t	 sep;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/9.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/9.cc
index d087958..51e9efd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/9.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/9.cc
@@ -31,7 +31,6 @@
 // libstdc++/2830
 void test09()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring blanks(3, L'\0');
   std::wstring foo = L"peace";
   foo += blanks;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/1.cc
index 1ccb9da..1647dfc 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -148,7 +147,6 @@ bool test01(void)
   str05.append(str05.begin(), str05.begin() + str05.find('r')); 
   VERIFY( str05 ==  "point bolivar, texaspoint boliva" );
   VERIFY( str05 != str01 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/2.cc
index b393f1e..a893c93 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/2.cc
@@ -27,8 +27,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   string one; 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/3.cc
index 178670d..096f3fc 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/3.cc
@@ -27,8 +27,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   const char * source = "Kesto";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/4.cc
index 0df4a6d..f768fde 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/char/4.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("foo");
   std::string str2;
   str2 += str1;
@@ -42,8 +41,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str("a");
   char c = 'b';
   str.append(&c, 1);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/1.cc
index 0700d70..e0d4c65 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -148,7 +147,6 @@ bool test01(void)
   str05.append(str05.begin(), str05.begin() + str05.find(L'r')); 
   VERIFY( str05 ==  L"point bolivar, texaspoint boliva" );
   VERIFY( str05 != str01 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/2.cc
index 084d1fd..c298496 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/2.cc
@@ -27,8 +27,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   wstring one; 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/3.cc
index 4ecea76..91d2de2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/3.cc
@@ -33,8 +33,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   const wchar_t * source = L"Kesto";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/4.cc
index dc1bd64..69f7556 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/append/wchar_t/4.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"foo");
   std::wstring str2;
   str2 += str1;
@@ -42,8 +41,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str(L"a");
 
   wchar_t c = L'b';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/1.cc
index c2dd067..4250e59 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/1.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
 
   const char* strlit = "../the long pier/Hanalei Bay/Kauai/Hawaii";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/2.cc
index ff85419..9cbcd13 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/2.cc
@@ -27,8 +27,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
   
   string one = "Selling England by the pound";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/3.cc
index 33644d0..90ba1a4 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/3.cc
@@ -27,8 +27,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   string one; 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/4.cc
index 201dee0..cfa87b2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/4.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("foo");
   std::string str2;
   str2.assign(str1);
@@ -39,8 +38,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str("a");
   char c = 'b';
   str.assign(&c, 1);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign.cc
index 3f942bd..b8ebfec 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/char/move_assign.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string a, b;
   a.push_back('1');
   b.assign(std::move(a));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/1.cc
index f5a16b4..0fd8c07 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/1.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
 
   const wchar_t* strlit = L"../the long pier/Hanalei Bay/Kauai/Hawaii";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/2.cc
index ea852ec..e672f3c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/2.cc
@@ -27,8 +27,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
   
   wstring one = L"Selling England by the pound";
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/3.cc
index 0b1e2d7..3f63faa 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/3.cc
@@ -27,8 +27,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
  
   wstring one; 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/4.cc
index 5fb7a64..04e8f1b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/4.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"foo");
   std::wstring str2;
   str2.assign(str1);
@@ -39,8 +38,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str(L"a");
 
   wchar_t c = L'b';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign.cc
index 2eb5e3d..322ffbb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/assign/wchar_t/move_assign.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring a, b;
   a.push_back(L'1');
   b.assign(std::move(a));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/1.cc
index 43dccf3..e63d76e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-int test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::iterator citerator;
   csize_type csz01, csz02;
@@ -178,7 +177,6 @@ int test01(void)
   csz01 = str03.size();
   str03.insert(str03.end(), str01.begin(), str01.end()); 
   VERIFY( str03 == "baker beach, san franciscorodeo beach, marin" );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/2.cc
index fe82996..86451d9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/2.cc
@@ -26,10 +26,8 @@
 //   string& insert(size_type __p, const char* s, size_type n);
 //   string& insert(size_type __p, const char* s);
 // but now s points inside the _Rep
-int test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str01;
   const char* title = "Everything was beautiful, and nothing hurt";
   // Increasing size: str01 is reallocated every time.
@@ -72,7 +70,6 @@ int test02(void)
   str01.insert(0, str01.c_str());
   VERIFY( str01 == "Everything was beautiful, and nothing hurt"
 	  "Everything was beautiful, and nothing hurt");
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/3.cc
index 7ebbb33..c33a9e3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/char/3.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("foo");
   std::string str2;
   str2.insert(0, str1);
@@ -43,8 +42,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str("a");
   char c = 'b';
   str.insert(0, &c, 1);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/1.cc
index 30c0770..982d3c3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-int test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::iterator citerator;
   csize_type csz01, csz02;
@@ -178,7 +177,6 @@ int test01(void)
   csz01 = str03.size();
   str03.insert(str03.end(), str01.begin(), str01.end()); 
   VERIFY( str03 == L"baker beach, san franciscorodeo beach, marin" );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/2.cc
index fc9ee91..bbb7de2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/2.cc
@@ -26,10 +26,8 @@
 //   wstring& insert(size_type __p, const wchar_t* s, size_type n);
 //   wstring& insert(size_type __p, const wchar_t* s);
 // but now s points inside the _Rep
-int test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str01;
   const wchar_t* title = L"Everything was beautiful, and nothing hurt";
   // Increasing size: str01 is reallocated every time.
@@ -72,7 +70,6 @@ int test02(void)
   str01.insert(0, str01.c_str());
   VERIFY( str01 == L"Everything was beautiful, and nothing hurt"
 	  L"Everything was beautiful, and nothing hurt");
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/3.cc
index 5d2587c..1b55698 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/insert/wchar_t/3.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"foo");
   std::wstring str2;
   str2.insert(0, str1);
@@ -43,8 +42,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str(L"a");
 
   wchar_t c = L'b';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc
index d5cd2a1..8930d45 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/char/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string cstr("Badger");
   std::string str = cstr;
   str.pop_back();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc
index 22a46c3..869200c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/pop_back/wchar_t/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring cstr(L"Badger");
   std::wstring str = cstr;
   str.pop_back();
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/1.cc
index a02d1e5..b5961f8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/1.cc
@@ -23,9 +23,8 @@
 #include <algorithm> // for std::find
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -71,7 +70,6 @@ bool test01(void)
 	    std::find(x.rbegin(), x.rend(), 'l').base(), ar, 
 	    ar + sizeof(ar) / sizeof(ar[0]));
   VERIFY( x == "jeHelloo" );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/2.cc
index 510df8e..e1b50c1 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/2.cc
@@ -25,7 +25,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit = "../the long pier/Hanalei Bay/Kauai/Hawaii";
   std::string aux = strlit;
   aux.replace(aux.begin()+5, aux.begin()+20,
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/3.cc
index dcdc36a..e1c1719 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/3.cc
@@ -26,7 +26,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   const char* title01 = "nine types of ambiguity";
   const char* title02 = "ultra";
   std::string str01 = title01;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/4.cc
index eff9660..cff071d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/4.cc
@@ -28,7 +28,6 @@
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
   std::string str01 = "geogaddi";
   std::string str02;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/5.cc
index f751fac..0a3f5e0 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/5.cc
@@ -27,7 +27,6 @@
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
   std::string str01 = "londinium";
   std::string str02 = "cydonia";
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/6.cc
index edfe617..75a6a48 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/6.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str01("Valle Del Salto");
   str01.replace(0, 5, str01.data() + 10, 5);
   VERIFY( str01 == "Salto Del Salto" );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/7.cc
index afefa84..3d55bb8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/char/7.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("foo");
   std::string str2("bar");
   str2.replace(0, 3, str1);
@@ -51,8 +50,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str("a");
   char c = 'b';
   str.replace(0, 1, &c, 1);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/1.cc
index ea36e51..9ca7512 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/1.cc
@@ -23,9 +23,8 @@
 #include <algorithm> // for std::find
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -71,7 +70,6 @@ bool test01(void)
 	    std::find(x.rbegin(), x.rend(), L'l').base(), ar, 
 	    ar + sizeof(ar) / sizeof(ar[0]));
   VERIFY( x == L"jeHelloo" );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/2.cc
index 7469951..6baf863 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/2.cc
@@ -26,7 +26,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* strlit = L"../the long pier/Hanalei Bay/Kauai/Hawaii";
   std::wstring aux = strlit;
   aux.replace(aux.begin()+5, aux.begin()+20,
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/3.cc
index ba01d1b..4a6033b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/3.cc
@@ -26,7 +26,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* title01 = L"nine types of ambiguity";
   const wchar_t* title02 = L"ultra";
   std::wstring str01 = title01;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/4.cc
index a313d1a..109c4c3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/4.cc
@@ -28,7 +28,6 @@
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str01 = L"geogaddi";
   std::wstring str02;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/5.cc
index 93fae0c..cf93370 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/5.cc
@@ -27,7 +27,6 @@
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str01 = L"londinium";
   std::wstring str02 = L"cydonia";
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/6.cc
index e12441c..61e7f35 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/6.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str01(L"Valle Del Salto");
   str01.replace(0, 5, str01.data() + 10, 5);
   VERIFY( str01 == L"Salto Del Salto" );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/7.cc b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/7.cc
index 692c52d..0181151 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/modifiers/replace/wchar_t/7.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"foo");
   std::wstring str2(L"bar");
   str2.replace(0, 3, str1);
@@ -51,8 +50,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str(L"a");
 
   wchar_t c = L'b';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc
index 6c4cb9e..af9a893 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc
@@ -26,7 +26,6 @@
 // DR 1261. Insufficient overloads for to_string / to_wstring
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const string one(to_string(-2));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
index 39b96b6..7e7c134 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
@@ -30,7 +30,8 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
+
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
index 4108691..976deae 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc
index b039c48..669dfc7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc
index 0322fcd..40ddbac 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc
index 05a6384..15a4dca 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc
index 579d550..9060f5c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc
index 77b3984..d5ec6a9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoull.cc
index 3c1b2b7..49545a4 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoull.cc
@@ -30,7 +30,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/to_string.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/to_string.cc
index 4205a2a..adca24e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/to_string.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/to_string.cc
@@ -28,7 +28,7 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   using namespace std;
   
   long long ll1 = -2;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/dr1261.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/dr1261.cc
index abeb0c3..90b1b2e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/dr1261.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/dr1261.cc
@@ -26,7 +26,6 @@
 // DR 1261. Insufficient overloads for to_string / to_wstring
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const wstring one(to_wstring(-2));
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
index bd64cc2..81735dd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
index 4d602ce..2da738c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc
index 6e3ca6f..284203a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stol.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stol.cc
index fe6b5bf..f1569b8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stol.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stol.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stold.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stold.cc
index 79bae37..82b8c8b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stold.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stold.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoll.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoll.cc
index 36f0922..c7209a4 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoll.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoll.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoul.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoul.cc
index a7a6838..5b76f81 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoul.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoul.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoull.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoull.cc
index dfa5784..dd6e92d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoull.cc
@@ -31,7 +31,7 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = false;
+  bool test = false;
   using namespace std;
 
   try
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/to_wstring.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/to_wstring.cc
index cbfc1b8..802791c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/to_wstring.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/to_wstring.cc
@@ -29,7 +29,6 @@ test01()
 {
 #if _GLIBCXX_USE_C99_WCHAR
 
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   long long ll1 = -2;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
index 7fe30a7..8b7ff86 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
@@ -41,7 +41,6 @@ test_value(int result, want_value expected);
 int
 test_value(int result, want_value expected)
 {
-  bool test __attribute__((unused)) = true;
   bool pass = false;
 
   switch (expected) {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc
index 6ba24cb..e33ab21 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char lit_01[] = { 'w', 'e', '\0', 'r', 'd' };
   const char lit_02[] = { 'w', 'e', 'i', '\0', 'd' };
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/2.cc
index 08b3f0c..bc34a2f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/2.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("foobar");
   std::string str2("foobar");
 
@@ -53,8 +52,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string str("a");
   char c = 'a';
   int res = str.compare(0, 1, &c, 1);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc
index 48fe93c..1a28ad7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc
@@ -40,7 +40,6 @@ test_value(int result, want_value expected);
 int
 test_value(int result, want_value expected)
 {
-  bool test __attribute__((unused)) = true;
   bool pass = false;
 
   switch (expected) {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc
index bcdbf9c..7e7657c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const wchar_t lit_01[] = { L'w', L'e', L'\0', L'r', L'd' };
   const wchar_t lit_02[] = { L'w', L'e', L'i', L'\0', L'd' };
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/2.cc
index d79dcd5..5019479 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/2.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"foobar");
   std::wstring str2(L"foobar");
 
@@ -53,8 +52,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring str(L"a");
 
   wchar_t c = L'a';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
index 6fd3d9b..668424d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
@@ -22,8 +22,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::string empty;
 
   // data() for size == 0 is non-NULL.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
index 97b5d4a..8b98407 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
@@ -22,8 +22,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring empty;
 
   // data() for size == 0 is non-NULL.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc
index 4bda859..bc37f4d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -83,7 +82,6 @@ bool test01(void)
   VERIFY( csz01 == csz02 );
   csz01 = str01.find('/');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc
index aea3462..85d4f3a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   csize_type npos = std::string::npos;
   csize_type csz01, csz02;
@@ -82,7 +81,6 @@ bool test02(void)
   csz01 = str01.find_first_of('z');
   csz02 = str01.size() - 1;
   VERIFY( csz01 == csz02 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc
index 7fee95b..d2324c6 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test03(void)
+void test03(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   csize_type npos = std::string::npos;
   csize_type csz01;
@@ -82,7 +81,6 @@ bool test03(void)
   VERIFY( csz01 == 0 );
   csz01 = str04.find_first_not_of('S');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc
index bc0e6b2..52641b3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc
@@ -25,7 +25,6 @@
 // libstdc++/31401
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   csize_type npos = std::string::npos;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/5.cc
index 930c61a..683c708 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/5.cc
@@ -30,7 +30,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::string_view str1("bar");
   std::string str2("foobar");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc
index c6788c2..7dd9250 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -83,7 +82,6 @@ bool test01(void)
   VERIFY( csz01 == csz02 );
   csz01 = str01.find(L'/');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc
index 0954d3f..affd19f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test02(void)
+void test02(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   csize_type npos = std::wstring::npos;
   csize_type csz01, csz02;
@@ -82,7 +81,6 @@ bool test02(void)
   csz01 = str01.find_first_of(L'z');
   csz02 = str01.size() - 1;
   VERIFY( csz01 == csz02 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc
index 156148e..c0081f7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc
@@ -22,9 +22,8 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-bool test03(void)
+void test03(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   csize_type npos = std::wstring::npos;
   csize_type csz01;
@@ -82,7 +81,6 @@ bool test03(void)
   VERIFY( csz01 == 0 );
   csz01 = str04.find_first_not_of(L'S');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc
index 08b3641..e8c1835 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc
@@ -25,7 +25,6 @@
 // libstdc++/31401
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   csize_type npos = std::wstring::npos;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/5.cc
index 701cc4c..77a1c96 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/5.cc
@@ -30,7 +30,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring_view str1(L"bar");
   std::wstring str2(L"foobar");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc
index 752750f..035ce46 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.2 basic_string rfind
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -82,7 +81,6 @@ bool test01(void)
   VERIFY( csz01 == csz02 );
   csz01 = str01.rfind('/');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc
index 23b7051..06ca503 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.4 basic_string::find_last_of
-bool test02()
+void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::string z("ab");
   std::string::size_type pos;
   pos = z.find_last_of("ab");
@@ -40,7 +39,6 @@ bool test02()
   VERIFY( pos == 1 );
   pos = z.find_last_of('X');
   VERIFY( pos == std::string::npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc
index 68b4132..661be5a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.6 basic_string::find_last_not_of
-bool test03()
+void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   std::string::size_type pos;
   csize_type npos = std::string::npos;
@@ -55,7 +54,6 @@ bool test03()
   VERIFY( pos == 0 );
   pos = z.find_last_not_of("Xa");
   VERIFY( pos == 1 );
-  return test;
 }
 int main()
 {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc
index 06e833a..d9c7627 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.2 basic_string rfind
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -82,7 +81,6 @@ bool test01(void)
   VERIFY( csz01 == csz02 );
   csz01 = str01.rfind(L'/');
   VERIFY( csz01 == npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc
index af384bb..e977a6d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.4 basic_string::find_last_of
-bool test02()
+void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring::size_type pos;
   std::wstring z(L"ab");
   pos = z.find_last_of(L"ab");
@@ -40,7 +39,6 @@ bool test02()
   VERIFY( pos == 1 );
   pos = z.find_last_of(L'X');
   VERIFY( pos == std::wstring::npos );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc
index 0acd72f..33f277a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc
@@ -21,9 +21,8 @@
 #include <testsuite_hooks.h>
 
 // 21.3.6.6 basic_string::find_last_not_of
-bool test03()
+void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   std::wstring::size_type pos;
   csize_type npos = std::wstring::npos;
@@ -55,7 +54,6 @@ bool test03()
   VERIFY( pos == 0 );
   pos = z.find_last_not_of(L"Xa");
   VERIFY( pos == 1 );
-  return test;
 }
 int main()
 {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
index ecc7296..7604120 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::string::size_type csize_type;
   typedef std::string::const_reference cref;
   typedef std::string::reference ref;
@@ -64,7 +63,6 @@ bool test01(void)
   catch(...) {
     VERIFY( false );
   }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc
index 28020dc..2e18c7d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc
@@ -23,9 +23,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstring::size_type csize_type;
   typedef std::wstring::const_reference cref;
   typedef std::wstring::reference ref;
@@ -64,7 +63,6 @@ bool test01(void)
   catch(...) {
     VERIFY( false );
   }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/1.cc
index d51e08c..f6aa4ee 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/1.cc
@@ -25,8 +25,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::string str1;
   std::string str2;
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/2.cc
index 3ba112f..856c85c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/2.cc
@@ -114,7 +114,6 @@ template<class charT, class traits, class Allocator>
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
   std::string 	str_0("costa rica");
   std::string 	str_1("costa marbella");
   std::string 	str_2("cost");
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/3.cc
index d88aeeb..4ae0b65 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/3.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::string;
 
   VERIFY( (string("abc") + string("def")
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/4.cc
index ca3b75d..d37f01b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/4.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::string;
   using std::move;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/5.cc
index 33520ba..d30a308 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/char/5.cc
@@ -24,8 +24,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::string_view str1("foo");;
   std::string str2;
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/1.cc
index 064d71d..9841632 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/1.cc
@@ -25,8 +25,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str1;
   std::wstring str2;
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/2.cc
index 9787753..e22aed2 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/2.cc
@@ -114,7 +114,6 @@ template<class charT, class traits, class Allocator>
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 	str_0(L"costa rica");
   std::wstring 	str_1(L"costa marbella");
   std::wstring 	str_2(L"cost");
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/3.cc
index 37ac3f6..362b618 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/3.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::wstring;
 
   VERIFY( (wstring(L"abc") + wstring(L"def")
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/4.cc
index 16e45ba..292d917f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/4.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using std::wstring;
   using std::move;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/5.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/5.cc
index 2350253..619a29b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/operators/wchar_t/5.cc
@@ -24,8 +24,6 @@
 
 int test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring_view str1(L"foo");;
   std::wstring str2;
   
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/capacity/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/capacity/1.cc
index 74baee3..7e13adc 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/capacity/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/capacity/1.cc
@@ -126,8 +126,6 @@ namespace std
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::basic_string_view<A<B>> str02;
   typedef std::basic_string_view< A<B> >::size_type size_type_o;
   size_type_o sz03;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/1.cc
index 0534bfb..ba07a3e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
   typedef std::string_view::size_type csize_type;
 
   // basic_string_view()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/2.cc
index 331dd42..275b33a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/2.cc
@@ -27,7 +27,6 @@
 void
 test03()
 {
-  bool test [[gnu::unused]] = true;
   const char* with_nulls = "This contains \0 a zero byte.";
 
   // These are tests to see how basic_string_view handles data with NUL
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/3.cc
index 604aded..6a9b96d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/3.cc
@@ -26,8 +26,6 @@
 void
 test05()
 {
-  bool test [[gnu::unused]] = true;
-
   char const * s = 0;
   std::string_view zero_length_built_with_NULL(s, 0);
 }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/1.cc
index ba8bb90..0986571 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
   typedef std::wstring_view::size_type csize_type;
 
   // basic_string_view()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/2.cc
index 7dbc60c..4432972 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/2.cc
@@ -25,7 +25,6 @@
 void
 test03()
 {
-  bool test [[gnu::unused]] = true;
   const wchar_t* with_nulls = L"This contains \0 a zero byte.";
 
   // These are tests to see how basic_string_view handles data with NUL
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/3.cc
index 4fed4e2..26550df 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/3.cc
@@ -25,8 +25,6 @@
 void
 test05()
 {
-  bool test [[gnu::unused]] = true;
-
   wchar_t const * s = 0;
   std::wstring_view zero_length_built_with_NULL(s, 0);
 }
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/1.cc
index 1638b0e..714fccd 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/1.cc
@@ -23,11 +23,9 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   typedef std::string_view::const_reference cref;
   typedef std::string_view::reference ref;
@@ -62,8 +60,6 @@ test01()
   {
     VERIFY( false );
   }
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/empty.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/empty.cc
index c0f8206..fad5eb7 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/empty.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/empty.cc
@@ -24,8 +24,6 @@
 int
 main()
 {
-  bool test [[gnu::unused]] = true;
-
   {
     std::string_view empty;
     VERIFY( empty.empty() );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/front_back.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/front_back.cc
index 308d1e0..4ae3dc4 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/front_back.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/char/front_back.cc
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::string_view str("ramifications");
   const std::string_view cstr("melodien");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/1.cc
index 7e035fe..b16c5db 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/1.cc
@@ -23,11 +23,9 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   typedef std::wstring_view::const_reference cref;
   typedef std::wstring_view::reference ref;
@@ -62,8 +60,6 @@ test01()
   {
     VERIFY( false );
   }
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/empty.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/empty.cc
index c8896e1..7e2706c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/empty.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/empty.cc
@@ -24,8 +24,6 @@
 int
 main()
 {
-  bool test [[gnu::unused]] = true;
-  
   {
     std::wstring_view empty;
     VERIFY( empty.empty() );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/front_back.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/front_back.cc
index b334061..ce814d3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/front_back.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/element_access/wchar_t/front_back.cc
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wstring_view str(L"ramifications");
   const std::wstring_view cstr(L"melodien");
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/1.cc
index 7cef694..d205506 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/1.cc
@@ -30,11 +30,9 @@
 #include <iostream>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   typedef std::string_view::const_reference cref;
   typedef std::string_view::reference ref;
@@ -56,8 +54,6 @@ test01()
   
   std::string_view hello_world;
   std::cout << hello_world;
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/2.cc
index 441a403..9a8ff0f 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/2.cc
@@ -37,7 +37,7 @@
 void
 test05(std::size_t size)
 {
-  bool test [[gnu::unused]] = true;
+  bool test = true;
 
   const char filename[] = "inserters_extractors-2.txt";
   const char fillc = 'f';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/3.cc
index 9a8e814..230445c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/char/3.cc
@@ -32,8 +32,6 @@
 void
 test09()
 {
-  bool test [[gnu::unused]] = true;
-
   std::string_view foo{"peace\0\0\0& love"};
 
   std::ostringstream oss1;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/pod/10081-out.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/pod/10081-out.cc
index 27a52f9..cac9156 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/pod/10081-out.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/pod/10081-out.cc
@@ -37,8 +37,6 @@ test01()
   typedef basic_stringbuf<pod_ushort> 	stringbuf_type;
   typedef basic_ostream<pod_ushort> 	ostream_type;
 
-  bool test [[gnu::unused]] = true;
-
   string_type str;
   stringbuf_type strbuf01;
   ostream_type stream(&strbuf01);
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/1.cc
index 37af0bc..a53f5de 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/1.cc
@@ -30,11 +30,9 @@
 #include <iostream>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   typedef std::wstring_view::const_reference cref;
   typedef std::wstring_view::reference ref;
@@ -61,8 +59,6 @@ test01()
   
   std::wstring_view hello_world;
   std::wcout << hello_world;
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc
index 86fe727..27f952d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc
@@ -35,7 +35,7 @@
 void
 test05(std::size_t size)
 {
-  bool test [[gnu::unused]] = true;
+  bool test = true;
 
   const char filename[] = "inserters_extractors-2.txt";
   const wchar_t fillc = L'f';
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/3.cc
index e3af23c..01a25fe 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/3.cc
@@ -31,8 +31,6 @@
 void
 test09()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wstring_view foo{L"peace\0\0\0& love"};
   
   std::wostringstream oss1;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc
index 5f2bd75..476b289 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/char/1.cc
@@ -23,8 +23,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::string_view;
 
   string_view str0{"olympus mons"};
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc
index 2f71694..cbf7640 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_prefix/wchar_t/1.cc
@@ -23,8 +23,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::wstring_view;
 
   wstring_view str0{L"olympus mons"};
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc
index a6eb5c5..eb67a44 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/char/1.cc
@@ -23,8 +23,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::string_view;
 
   string_view str0{"olympus mons"};
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc
index 3162e2b..e8d3d3e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/modifiers/remove_suffix/wchar_t/1.cc
@@ -23,8 +23,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::wstring_view;
 
   wstring_view str0{L"olympus mons"};
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
index 28e2514..9fdc13b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
@@ -41,7 +41,6 @@ test_value(int result, want_value expected);
 int
 test_value(int result, want_value expected)
 {
-  bool test [[gnu::unused]] = true;
   bool pass = false;
 
   switch (expected) {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/13650.cc
index 9e22a46..629f3cc 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/13650.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/13650.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::string_view;
 
   const char lit_01[]{ 'w', 'e', '\0', 'r', 'd' };
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
index 8bf70ec..0251372 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
@@ -40,7 +40,6 @@ test_value(int result, want_value expected);
 int
 test_value(int result, want_value expected)
 {
-  bool test [[gnu::unused]] = true;
   bool pass = false;
 
   switch (expected) {
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/13650.cc
index fc3c197..fbdb7d3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/13650.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/13650.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   using std::wstring_view;
 
   const wchar_t lit_01[] = { L'w', L'e', L'\0', L'r', L'd' };
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc
index a583e13..955d1fb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/char/1.cc
@@ -25,8 +25,6 @@
 bool
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
 
   const char str_lit01[] = "123456789A";
@@ -36,8 +34,6 @@ test01()
   csize_type len = str01.copy(buffer, sizeof(buffer), 8);
   VERIFY( 2 == len );
   VERIFY( '9' == buffer[0] );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc
index 94fa0d4..54d1667 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/copy/wchar_t/1.cc
@@ -25,8 +25,6 @@
 bool
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   csize_type csz01;
 
@@ -37,8 +35,6 @@ test01()
   csize_type len = str01.copy(buffer, sizeof(buffer), 8);
   VERIFY( 2 == len );
   VERIFY( L'9' == buffer[0] );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc
index 63eba23..18fc9f5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/char/1.cc
@@ -25,8 +25,6 @@
 int
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::string_view empty;
 
   VERIFY( empty.size() == 0 );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc
index 86da7df..6596db5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/data/wchar_t/1.cc
@@ -25,8 +25,6 @@
 int
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wstring_view empty;
 
   VERIFY( empty.size() == 0 );
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/1.cc
index 835c78b..8a77c76 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/1.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   typedef std::string_view::const_reference cref;
   typedef std::string_view::reference ref;
@@ -85,8 +83,6 @@ test01()
   VERIFY( csz01 == csz02 );
   csz01 = str01.find('/');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/2.cc
index 4417bfe..c112414 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/2.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test02()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   csize_type npos = std::string_view::npos;
   csize_type csz01, csz02;
@@ -84,8 +82,6 @@ test02()
   csz01 = str01.find_first_of('z');
   csz02 = str01.size() - 1;
   VERIFY( csz01 == csz02 );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/3.cc
index 4861065..cf5014b 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/3.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test03()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   csize_type npos = std::string_view::npos;
   csize_type csz01;
@@ -84,8 +82,6 @@ test03()
   VERIFY( csz01 == 0 );
   csz01 = str04.find_first_not_of('S');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/4.cc
index 6d49122..9391a22 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/4.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   csize_type npos = std::string_view::npos;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/1.cc
index fb147a0..e15af9e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/1.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   typedef std::wstring_view::const_reference cref;
   typedef std::wstring_view::reference ref;
@@ -85,8 +83,6 @@ test01()
   VERIFY( csz01 == csz02 );
   csz01 = str01.find(L'/');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/2.cc
index 0373a9c..a533e13 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/2.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test02()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   csize_type npos = std::wstring_view::npos;
   csize_type csz01, csz02;
@@ -84,8 +82,6 @@ test02()
   csz01 = str01.find_first_of(L'z');
   csz02 = str01.size() - 1;
   VERIFY( csz01 == csz02 );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/3.cc
index 82357b8..4faee2e 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/3.cc
@@ -22,11 +22,9 @@
 #include <string_view>
 #include <testsuite_hooks.h>
 
-bool
+void
 test03()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   csize_type npos = std::wstring_view::npos;
   csize_type csz01;
@@ -84,8 +82,6 @@ test03()
   VERIFY( csz01 == 0 );
   csz01 = str04.find_first_not_of(L'S');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/4.cc
index 95671de..aa9b6cc 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/wchar_t/4.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   csize_type npos = std::wstring_view::npos;
 
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/1.cc
index 1f886e7..f9e1bf1 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/1.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view rfind
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   typedef std::string_view::const_reference cref;
   typedef std::string_view::reference ref;
@@ -85,8 +83,6 @@ test01()
   VERIFY( csz01 == csz02 );
   csz01 = str01.rfind('/');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/2.cc
index 49232f8..3b2c30a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/2.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view::find_last_of
 
-bool
+void
 test02()
 {
-  bool test [[gnu::unused]] = true;
-
   std::string_view z("ab");
   std::string_view::size_type pos;
   pos = z.find_last_of("ab");
@@ -43,8 +41,6 @@ test02()
   VERIFY( pos == 1 );
   pos = z.find_last_of('X');
   VERIFY( pos == std::string_view::npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/3.cc
index ecd3400..471a0c8 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/3.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view::find_last_not_of
 
-bool
+void
 test03()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   std::string_view::size_type pos;
   csize_type npos = std::string_view::npos;
@@ -58,8 +56,6 @@ test03()
   VERIFY( pos == 0 );
   pos = z.find_last_not_of("Xa");
   VERIFY( pos == 1 );
-
-  return test;
 }
 int
 main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/1.cc
index ee28bdc..7eff92c 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/1.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view rfind
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   typedef std::wstring_view::const_reference cref;
   typedef std::wstring_view::reference ref;
@@ -85,8 +83,6 @@ test01()
   VERIFY( csz01 == csz02 );
   csz01 = str01.rfind(L'/');
   VERIFY( csz01 == npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/2.cc
index 4f173ff..2acdcd3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/2.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view::find_last_of
 
-bool
+void
 test02()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wstring_view::size_type pos;
   std::wstring_view z(L"ab");
   pos = z.find_last_of(L"ab");
@@ -43,8 +41,6 @@ test02()
   VERIFY( pos == 1 );
   pos = z.find_last_of(L'X');
   VERIFY( pos == std::wstring_view::npos );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/3.cc
index 0b9ea54..b2ade36 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/wchar_t/3.cc
@@ -22,11 +22,9 @@
 
 // basic_string_view::find_last_not_of
 
-bool
+void
 test03()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   std::wstring_view::size_type pos;
   csize_type npos = std::wstring_view::npos;
@@ -58,8 +56,6 @@ test03()
   VERIFY( pos == 0 );
   pos = z.find_last_not_of(L"Xa");
   VERIFY( pos == 1 );
-
-  return test;
 }
 int
 main()
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/string_conversion/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/string_conversion/1.cc
index 617877f..d904da5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/string_conversion/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/string_conversion/1.cc
@@ -25,11 +25,9 @@
 #include <testsuite_hooks.h>
 #include <testsuite_allocator.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   const char str_lit[] = "123456789A";
   const std::string_view sv(str_lit);
   char buffer[4] = { 0 };
@@ -44,8 +42,6 @@ test01()
   VERIFY( std::equal(s1.begin(), s1.end(), s2.begin(), s2.end()) );
   auto s3 = static_cast<std::string>(sv);
   VERIFY( s3 == s1 );
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc
index 08832cd..ab573e9 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/char/1.cc
@@ -23,11 +23,9 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::string_view::size_type csize_type;
   typedef std::string_view::const_reference cref;
   typedef std::string_view::reference ref;
@@ -70,8 +68,6 @@ test01()
   {
     VERIFY( false );
   }
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc
index d8e6cb0..dfa656de 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/substr/wchar_t/1.cc
@@ -23,11 +23,9 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool
+void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   typedef std::wstring_view::size_type csize_type;
   typedef std::wstring_view::const_reference cref;
   typedef std::wstring_view::reference ref;
@@ -70,8 +68,6 @@ test01()
   {
     VERIFY( false );
   }
-
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/2.cc
index 04c02e9..e405593 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/char/2.cc
@@ -115,8 +115,6 @@ template<class charT, class traits, class Allocator>
 int
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::string_view 	str_0("costa rica");
   std::string_view 	str_1("costa marbella");
   std::string_view 	str_2("cost");
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/2.cc
index 5e9f7e4..1b4e0f4 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operators/wchar_t/2.cc
@@ -115,8 +115,6 @@ template<class charT, class traits, class Allocator>
 int
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wstring_view 	str_0(L"costa rica");
   std::wstring_view 	str_1(L"costa marbella");
   std::wstring_view 	str_2(L"cost");
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc
index 5346255..d36f0f3 100644
--- a/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   char c = 'a';
   const char cc = 'b';
   char* c1 = &c;
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc
index 0345f69..67a00d5 100644
--- a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   wchar_t c = L'a';
   const wchar_t cc = L'b';
   wchar_t* c1 = &c;
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/1.cc
index 9a5f269..034ec1d 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/1.cc
@@ -24,7 +24,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
   const std::string str_01("zuma beach");
   const std::string str_02("montara and ocean beach");
  
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc
index 2c2f3b8..a4ec0c8 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/57704.cc
@@ -20,8 +20,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   char a = '\x7f';
   char b = '\x80';
 
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/short/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/short/1.cc
index 0a2d2ee..4309c64 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/short/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/short/1.cc
@@ -30,7 +30,6 @@
 void test02(void)
 {
   typedef short char_type;
-  bool test __attribute__((unused)) = true;
  
   // 21.1.1 character traits requirements
 
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/1.cc
index b4221a4..375aeff 100644
--- a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/1.cc
@@ -24,7 +24,6 @@
 
 void test02(void)
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01(L"zuma beach");
   const std::wstring str_02(L"montara and ocean beach");
  
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/1.cc
index de6f06c..c35a812 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/char/1.cc
@@ -26,7 +26,7 @@
 #include <iterator>
 #include <testsuite_hooks.h>
 
-#ifndef _GLIBCXX_ASSERT
+#ifdef TEST_TIMEGET_VERBOSE
 #  include <iostream>
 #  define PRINT(x) cout << #x << ": " << x << endl
 #  define TESTHEAD(x) cout << x << endl
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
index 3d8d6ef..20a8a10 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <testsuite_hooks.h>
 
-#ifndef _GLIBCXX_ASSERT
+#ifdef TEST_TIMEGET_VERBOSE
 #  include <iostream>
 #  define PRINT(x) cout << #x << ": " << x << endl
 #  define TESTHEAD(x) cout << x << endl
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/1.cc
index db8c06e..8383076 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/1.cc
@@ -26,7 +26,7 @@
 #include <iterator>
 #include <testsuite_hooks.h>
 
-#ifndef _GLIBCXX_ASSERT
+#ifdef TEST_TIMEGET_VERBOSE
 #  include <iostream>
 #  define PRINT(x) cout << #x << ": " << x << endl
 #  define TESTHEAD(x) cout << x << endl
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
index 48ddb39..3797e34 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <testsuite_hooks.h>
 
-#ifndef _GLIBCXX_ASSERT
+#ifdef TEST_TIMEGET_VERBOSE
 #  include <iostream>
 #  define PRINT(x) cout << #x << ": " << x << endl
 #  define TESTHEAD(x) cout << x << endl
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
index 93c402e..5c6bb87 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4879.cc
@@ -34,9 +34,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // libstdc++/2913, libstdc++/4879
@@ -46,7 +43,7 @@ test_04()
 {
   using namespace __gnu_test;
 
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   const char* name = "tmp_fifo1";
   semaphore s1, s2;
 
@@ -92,7 +89,6 @@ test_04()
   if (!(ofs.rdstate() & std::ios::failbit))
     {
       test = false;
-      VERIFY( test );
     }
 
   unlink(name);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
index 0a095a3..106d122 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc
@@ -33,9 +33,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // libstdc++/9964
@@ -43,7 +40,7 @@ bool test_07()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   semaphore s1, s2;
 
   const char* name = "tmp_fifo3";
@@ -54,7 +51,7 @@ bool test_07()
   mkfifo(name, S_IRWXU);
   
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
@@ -68,15 +65,15 @@ bool test_07()
   
   filebuf fb;
   filebuf* ret = fb.open(name, ios_base::in | ios_base::out);
-  VERIFY( ret != 0 );
-  VERIFY( fb.is_open() );
+  test &= bool( ret != 0 );
+  test &= bool( fb.is_open() );
   s1.signal();
   s2.wait();
   fb.sputc('a');
 
   ret = fb.close();
-  VERIFY( ret != 0 );
-  VERIFY( !fb.is_open() );
+  test &= bool( ret != 0 );
+  test &= bool( !fb.is_open() );
 
   return test;
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
index fdd1a7e..ecda598 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
@@ -29,15 +29,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // libstdc++/13171
 bool test01()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   using namespace std;
   using namespace __gnu_test;
 
@@ -66,11 +63,11 @@ bool test01()
   fb.pubimbue(loc_fr);
   fb.open(name, ios_base::in);
   s1.wait();
-  VERIFY( fb.is_open() );
+  test &= bool( fb.is_open() );
   fb.pubimbue(loc_en);
   filebuf::int_type c = fb.sgetc();
   fb.close();
-  VERIFY( c == 'S' );
+  test &= bool( c == 'S' );
   s2.signal();
 
   return test;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc
index 2ed9a40..d9e7d7d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc
@@ -30,9 +30,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphore if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // libstdc++/14975
@@ -40,7 +37,7 @@ bool test01()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   locale loc_us = locale(ISO_8859(1,en_US));
 
@@ -53,7 +50,7 @@ bool test01()
   semaphore s1;
 
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
@@ -68,8 +65,8 @@ bool test01()
   wfilebuf fb;
   fb.pubimbue(loc_us);
   wfilebuf* ret = fb.open(name, ios_base::out);
-  VERIFY( ret != 0 );
-  VERIFY( fb.is_open() );
+  test &= bool( ret != 0 );
+  test &= bool( fb.is_open() );
 
   s1.wait();
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/26777.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/26777.cc
index b0b49b1..6748a61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/26777.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/26777.cc
@@ -20,9 +20,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 #include <fstream>
 #include <sstream>
@@ -39,7 +36,7 @@ bool test01()
   using namespace std;
   using namespace __gnu_test;
 
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo6";
 
@@ -50,13 +47,13 @@ bool test01()
   semaphore s1, s2;
 
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
       filebuf fbout;
       fbout.open(name, ios_base::in | ios_base::out);
-      VERIFY( fbout.is_open() );
+      test &= bool( fbout.is_open() );
       fbout.sputn("Whatever", 8);
       fbout.pubsync();
       s1.signal();
@@ -79,7 +76,7 @@ bool test01()
   oss << &fbin;
   fbin.close();
 
-  VERIFY( oss.str() == "Whatever" );
+  test &= bool( oss.str() == "Whatever" );
 
   return test;
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/10097.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/10097.cc
index 2d6e6db..6b149c5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/10097.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/10097.cc
@@ -30,9 +30,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 class UnderBuf : public std::filebuf
@@ -53,7 +50,7 @@ bool test16()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo1";
   
@@ -62,7 +59,7 @@ bool test16()
   
   if (0 != mkfifo(name, S_IRWXU))
     {
-      VERIFY( false );
+      test = false;
     }
   
   semaphore s1, s2;
@@ -70,13 +67,13 @@ bool test16()
   if (fval == -1)
     {
       unlink(name);
-      VERIFY( false );
+      test = false;
     }
   else if (fval == 0)
     {
       filebuf fbout;
       fbout.open(name, ios_base::in|ios_base::out);
-      VERIFY( fbout.is_open() );
+      test &= bool( fbout.is_open() );
       fbout.sputn("0123456789", 10);
       fbout.pubsync();
       s1.wait();
@@ -96,8 +93,8 @@ bool test16()
       --n;
       
       UnderBuf::int_type c = fb.pub_underflow();
-      VERIFY( c != UnderBuf::traits_type::eof() );
-      
+      test &= bool( c != UnderBuf::traits_type::eof() );
+
       fb.sbumpc();
     }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
index 1311694..72b978d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
@@ -26,10 +26,6 @@
 
 using namespace std;
 
-#ifndef _GLIBCXX_ASSERT
-#  define TEST_NUMPUT_VERBOSE 1
-#endif
-
 struct _TestCase
 {
   double val;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc
index a26fafa..364bc56 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/hexfloat.cc
@@ -27,10 +27,6 @@
 #include <string>
 #include <testsuite_hooks.h>
 
-#ifndef _GLIBCXX_ASSERT
-#  define TEST_NUMPUT_VERBOSE 1
-#endif
-
 #ifdef TEST_NUMPUT_VERBOSE
 #  include <iostream>
 #endif
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
index 449f289..4c98653 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
@@ -26,10 +26,6 @@
 
 using namespace std;
 
-#ifndef _GLIBCXX_ASSERT
-#  define TEST_NUMPUT_VERBOSE 1
-#endif
-
 struct _TestCase
 {
   double val;
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/7.cc b/libstdc++-v3/testsuite/27_io/objects/char/7.cc
index f9608da..f016c04 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/7.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/7.cc
@@ -30,10 +30,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-// No asserts, avoid leaking the semaphore if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // Check that cout.flush() is called when last ios_base::Init is destroyed.
@@ -41,7 +37,7 @@ bool test07()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo4";
 
@@ -52,13 +48,13 @@ bool test07()
   semaphore s1;
 
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
       filebuf fbout;
       fbout.open(name, ios_base::in|ios_base::out);
-      VERIFY( fbout.is_open() );
+      test &= bool( fbout.is_open() );
       s1.wait();
       cout.rdbuf(&fbout);
       fbout.sputc('a');
@@ -70,8 +66,8 @@ bool test07()
   fbin.open(name, ios_base::in);
   s1.signal();
   filebuf::int_type c = fbin.sbumpc();
-  VERIFY( c != filebuf::traits_type::eof() );
-  VERIFY( c == filebuf::traits_type::to_int_type('a') );
+  test &= bool( c != filebuf::traits_type::eof() );
+  test &= bool( c == filebuf::traits_type::to_int_type('a') );
 
   fbin.close();
 
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc b/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc
index e2d91bc..12da7c9 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/9661-1.cc
@@ -20,9 +20,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 #include <cstdio>
 #include <cstdlib>
@@ -41,7 +38,7 @@ bool test01()
   using namespace std;
   using namespace __gnu_test;
 
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo5";
 
@@ -52,12 +49,12 @@ bool test01()
   semaphore s1, s2;
   
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
       FILE* file = fopen(name, "r+");
-      VERIFY( file != 0 );
+      test &= bool( file != 0 );
       fputs("Whatever\n", file);
       fflush(file);
       s1.signal();
@@ -67,25 +64,25 @@ bool test01()
       exit(0);
     }
 
-  VERIFY( freopen(name, "r", stdin) );
+  test &= bool( freopen(name, "r", stdin) );
   s1.wait();
 
   int c1 = fgetc(stdin);
-  VERIFY( c1 != EOF );
+  test &= bool( c1 != EOF );
   int c2 = cin.rdbuf()->sputbackc('a');
-  VERIFY( c2 != EOF );
-  VERIFY( c2 == 'a' );
+  test &= bool( c2 != EOF );
+  test &= bool( c2 == 'a' );
   
   int c3 = fgetc(stdin);
-  VERIFY( c3 != EOF );
-  VERIFY( c3 == c2 );
+  test &= bool( c3 != EOF );
+  test &= bool( c3 == c2 );
   int c4 = ungetc('b', stdin);
-  VERIFY( c4 != EOF );
-  VERIFY( c4 == 'b' );
+  test &= bool( c4 != EOF );
+  test &= bool( c4 == 'b' );
   
   int c5 = cin.rdbuf()->sgetc();
-  VERIFY( c5 != EOF );
-  VERIFY( c5 == c4 );
+  test &= bool( c5 != EOF );
+  test &= bool( c5 == c4 );
   s2.signal();
   s1.wait();
 
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/7.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/7.cc
index f195429..3e63fe0 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/7.cc
@@ -31,9 +31,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-// No asserts, avoid leaking the semaphore if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 
 // Check that wcout.flush() is called when last ios_base::Init is destroyed.
@@ -41,7 +38,7 @@ bool test07()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo4";
 
@@ -52,7 +49,7 @@ bool test07()
   semaphore s1;
 
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
@@ -69,8 +66,8 @@ bool test07()
   fbin.open(name, ios_base::in);
   s1.signal();
   wfilebuf::int_type c = fbin.sbumpc();
-  VERIFY( c != wfilebuf::traits_type::eof() );
-  VERIFY( c == wfilebuf::traits_type::to_int_type(L'a') );
+  test &= bool( c != wfilebuf::traits_type::eof() );
+  test &= bool( c == wfilebuf::traits_type::to_int_type(L'a') );
 
   fbin.close();
 
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc
index 01da01a..b2e5957 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-1.cc
@@ -20,9 +20,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// No asserts, avoid leaking the semaphores if a VERIFY fails.
-#undef _GLIBCXX_ASSERT
-
 #include <testsuite_hooks.h>
 #include <cstdio>
 #include <cstdlib>
@@ -41,7 +38,7 @@ bool test01()
   using namespace std;
   using namespace __gnu_test;
 
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   const char* name = "tmp_fifo5";
 
@@ -52,7 +49,7 @@ bool test01()
   semaphore s1, s2;
 
   int child = fork();
-  VERIFY( child != -1 );
+  test &= bool( child != -1 );
 
   if (child == 0)
     {
@@ -66,25 +63,25 @@ bool test01()
       exit(0);
     }
 
-  VERIFY( freopen(name, "r", stdin) );
+  test &= bool( freopen(name, "r", stdin) );
   s1.wait();
 
   wint_t c1 = fgetwc(stdin);
-  VERIFY( c1 != WEOF );
+  test &= bool( c1 != WEOF );
   wint_t c2 = wcin.rdbuf()->sputbackc(L'a');
-  VERIFY( c2 != WEOF );
-  VERIFY( c2 == L'a' );
+  test &= bool( c2 != WEOF );
+  test &= bool( c2 == L'a' );
   
   wint_t c3 = fgetwc(stdin);
-  VERIFY( c3 != WEOF );
-  VERIFY( c3 == c2 );
+  test &= bool( c3 != WEOF );
+  test &= bool( c3 == c2 );
   wint_t c4 = ungetwc(L'b', stdin);
-  VERIFY( c4 != WEOF );
-  VERIFY( c4 == L'b' );
+  test &= bool( c4 != WEOF );
+  test &= bool( c4 == L'b' );
   
   wint_t c5 = wcin.rdbuf()->sgetc();
-  VERIFY( c5 != WEOF );
-  VERIFY( c5 == c4 );
+  test &= bool( c5 != WEOF );
+  test &= bool( c5 == c4 );
   s2.signal();
   s1.wait();
 
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 1780eaf..bdb80a0 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -236,7 +236,7 @@ proc libstdc++_init { testfile } {
 
     # Default settings.
     set cxx [transform "g++"]
-    set cxxflags "-D_GLIBCXX_ASSERT -fmessage-length=0"
+    set cxxflags "-fmessage-length=0"
     set cxxpchflags ""
     set cxxvtvflags ""
     set cxxldflags ""
diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h
index c6f020c..e4c4866 100644
--- a/libstdc++-v3/testsuite/util/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h
@@ -21,10 +21,7 @@
 
 // This file provides the following:
 //
-// 1)  VERIFY(), via _GLIBCXX_ASSERT, from Brent Verner <brent@rcfile.org>.
-//   This file is included in the various testsuite programs to provide
-//   #define(able) assert() behavior for debugging/testing. It may be
-//   a suitable location for other furry woodland creatures as well.
+// 1)  VERIFY()
 //
 // 2)  set_memory_limits()
 //   set_memory_limits() uses setrlimit() to restrict dynamic memory
@@ -54,12 +51,16 @@
 #include <sys/stat.h>
 #endif
 
-#ifdef _GLIBCXX_ASSERT
-# include <cassert>
-# define VERIFY(fn) assert(fn)
-#else
-# define VERIFY(fn) test &= bool(fn)
-#endif
+#define VERIFY(fn)                                                      \
+  do                                                                    \
+  {                                                                     \
+    if (! (fn))								\
+      {									\
+	__builtin_printf("%s:%d: %s: Assertion '%s' failed.\n",		\
+			 __FILE__, __LINE__, __PRETTY_FUNCTION__, #fn); \
+	__builtin_abort();						\
+      }									\
+  } while (false)
 
 #ifdef _GLIBCXX_HAVE_UNISTD_H
 # include <unistd.h>
-- 
2.7.4