From 2437d31d0e52f0ea67ef1c7a2761f6bff8870c82 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Thu, 13 Oct 2016 19:37:45 +0000
Subject: [PATCH] container_access.cc: Remove 'test' variables.

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

	* testsuite/24_iterators/container_access.cc: Remove 'test' variables.
	* testsuite/24_iterators/istream_iterator/2.cc: Likewise.
	* testsuite/24_iterators/istreambuf_iterator/2.cc: Likewise.
	* testsuite/24_iterators/istreambuf_iterator/2627.cc: Likewise.
	* testsuite/24_iterators/operations/next.cc: Likewise.
	* testsuite/24_iterators/operations/prev.cc: Likewise.
	* testsuite/24_iterators/ostreambuf_iterator/2.cc: Likewise.
	* testsuite/24_iterators/random_access_iterator/26020.cc: Likewise.
	* testsuite/24_iterators/range_access_cpp14.cc: Likewise.
	* testsuite/24_iterators/reverse_iterator/11729.cc: Likewise.
	* testsuite/24_iterators/reverse_iterator/3.cc: Likewise.
	* testsuite/25_algorithms/adjacent_find/vectorbool.cc: Likewise.
	* testsuite/25_algorithms/all_of/1.cc: Likewise.
	* testsuite/25_algorithms/any_of/1.cc: Likewise.
	* testsuite/25_algorithms/binary_search/2.cc: Likewise.
	* testsuite/25_algorithms/binary_search/partitioned.cc: Likewise.
	* testsuite/25_algorithms/clamp/1.cc: Likewise.
	* testsuite/25_algorithms/clamp/2.cc: Likewise.
	* testsuite/25_algorithms/copy/1.cc: Likewise.
	* testsuite/25_algorithms/copy/2.cc: Likewise.
	* testsuite/25_algorithms/copy/3.cc: Likewise.
	* testsuite/25_algorithms/copy/34595.cc: Likewise.
	* testsuite/25_algorithms/copy/4.cc: Likewise.
	* testsuite/25_algorithms/copy/deque_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/copy/move_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc:
	Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc:
	Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc:
	Likewise.
	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc:
	Likewise.
	* testsuite/25_algorithms/copy_backward/deque_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/copy_backward/move_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/copy_n/1.cc: Likewise.
	* testsuite/25_algorithms/copy_n/2.cc: Likewise.
	* testsuite/25_algorithms/copy_n/3.cc: Likewise.
	* testsuite/25_algorithms/copy_n/4.cc: Likewise.
	* testsuite/25_algorithms/copy_n/50119.cc: Likewise.
	* testsuite/25_algorithms/copy_n/move_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/equal_range/2.cc: Likewise.
	* testsuite/25_algorithms/equal_range/partitioned.cc: Likewise.
	* testsuite/25_algorithms/fill/1.cc: Likewise.
	* testsuite/25_algorithms/fill/2.cc: Likewise.
	* testsuite/25_algorithms/fill/3.cc: Likewise.
	* testsuite/25_algorithms/fill/4.cc: Likewise.
	* testsuite/25_algorithms/fill_n/1.cc: Likewise.
	* testsuite/25_algorithms/find/39546.cc: Likewise.
	* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: Likewise.
	* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: Likewise.
	* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc:
	Likewise.
	* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc:
	Likewise.
	* testsuite/25_algorithms/find_if/1.cc: Likewise.
	* testsuite/25_algorithms/find_if_not/1.cc: Likewise.
	* testsuite/25_algorithms/for_each/1.cc: Likewise.
	* testsuite/25_algorithms/heap/1.cc: Likewise.
	* testsuite/25_algorithms/heap/moveable.cc: Likewise.
	* testsuite/25_algorithms/heap/moveable2.cc: Likewise.
	* testsuite/25_algorithms/heap/vectorbool.cc: Likewise.
	* testsuite/25_algorithms/includes/1.cc: Likewise.
	* testsuite/25_algorithms/inplace_merge/1.cc: Likewise.
	* testsuite/25_algorithms/inplace_merge/49559.cc: Likewise.
	* testsuite/25_algorithms/inplace_merge/moveable.cc: Likewise.
	* testsuite/25_algorithms/inplace_merge/moveable2.cc: Likewise.
	* testsuite/25_algorithms/is_heap/1.cc: Likewise.
	* testsuite/25_algorithms/is_heap_until/1.cc: Likewise.
	* testsuite/25_algorithms/is_partitioned/1.cc: Likewise.
	* testsuite/25_algorithms/is_permutation/1.cc: Likewise.
	* testsuite/25_algorithms/is_permutation/2.cc: Likewise.
	* testsuite/25_algorithms/is_permutation/vectorbool.cc: Likewise.
	* testsuite/25_algorithms/is_sorted/1.cc: Likewise.
	* testsuite/25_algorithms/is_sorted_until/1.cc: Likewise.
	* testsuite/25_algorithms/iter_swap/20577.cc: Likewise.
	* testsuite/25_algorithms/lower_bound/2.cc: Likewise.
	* testsuite/25_algorithms/lower_bound/partitioned.cc: Likewise.
	* testsuite/25_algorithms/make_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/max/1.cc: Likewise.
	* testsuite/25_algorithms/max/2.cc: Likewise.
	* testsuite/25_algorithms/max/3.cc: Likewise.
	* testsuite/25_algorithms/max/37547.cc: Likewise.
	* testsuite/25_algorithms/max/4.cc: Likewise.
	* testsuite/25_algorithms/min/1.cc: Likewise.
	* testsuite/25_algorithms/min/2.cc: Likewise.
	* testsuite/25_algorithms/min/3.cc: Likewise.
	* testsuite/25_algorithms/min/37547.cc: Likewise.
	* testsuite/25_algorithms/min/4.cc: Likewise.
	* testsuite/25_algorithms/minmax/1.cc: Likewise.
	* testsuite/25_algorithms/minmax/2.cc: Likewise.
	* testsuite/25_algorithms/minmax/3.cc: Likewise.
	* testsuite/25_algorithms/minmax/37547.cc: Likewise.
	* testsuite/25_algorithms/minmax_element/1.cc: Likewise.
	* testsuite/25_algorithms/move/1.cc: Likewise.
	* testsuite/25_algorithms/move/deque_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/move_backward/1.cc: Likewise.
	* testsuite/25_algorithms/move_backward/deque_iterators/1.cc: Likewise.
	* testsuite/25_algorithms/next_permutation/moveable.cc: Likewise.
	* testsuite/25_algorithms/none_of/1.cc: Likewise.
	* testsuite/25_algorithms/nth_element/1.cc: Likewise.
	* testsuite/25_algorithms/nth_element/2.cc: Likewise.
	* testsuite/25_algorithms/nth_element/3.cc: Likewise.
	* testsuite/25_algorithms/nth_element/moveable.cc: Likewise.
	* testsuite/25_algorithms/nth_element/random_test.cc: Likewise.
	* testsuite/25_algorithms/partial_sort/2.cc: Likewise.
	* testsuite/25_algorithms/partial_sort/check_compare_by_value.cc:
	Likewise.
	* testsuite/25_algorithms/partial_sort/moveable.cc: Likewise.
	* testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
	* testsuite/25_algorithms/partial_sort_copy/2.cc: Likewise.
	* testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
	* testsuite/25_algorithms/partition/1.cc: Likewise.
	* testsuite/25_algorithms/partition/moveable.cc: Likewise.
	* testsuite/25_algorithms/partition_copy/1.cc: Likewise.
	* testsuite/25_algorithms/partition_point/1.cc: Likewise.
	* testsuite/25_algorithms/pop_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/prev_permutation/moveable.cc: Likewise.
	* testsuite/25_algorithms/push_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/random_shuffle/1.cc: Likewise.
	* testsuite/25_algorithms/random_shuffle/moveable.cc: Likewise.
	* testsuite/25_algorithms/rotate/1.cc: Likewise.
	* testsuite/25_algorithms/rotate/moveable.cc: Likewise.
	* testsuite/25_algorithms/rotate/moveable2.cc: Likewise.
	* testsuite/25_algorithms/rotate/rotate.cc: Likewise.
	* testsuite/25_algorithms/search/1.cc: Likewise.
	* testsuite/25_algorithms/search_n/58358.cc: Likewise.
	* testsuite/25_algorithms/shuffle/1.cc: Likewise.
	* testsuite/25_algorithms/sort/1.cc: Likewise.
	* testsuite/25_algorithms/sort/check_compare_by_value.cc: Likewise.
	* testsuite/25_algorithms/sort/moveable.cc: Likewise.
	* testsuite/25_algorithms/sort/random_test.cc: Likewise.
	* testsuite/25_algorithms/sort/vectorbool.cc: Likewise.
	* testsuite/25_algorithms/sort_heap/check_compare_by_value.cc: Likewise.
	* testsuite/25_algorithms/sort_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/stable_partition/1.cc: Likewise.
	* testsuite/25_algorithms/stable_partition/mem_check.cc: Likewise.
	* testsuite/25_algorithms/stable_partition/moveable.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/2.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/3.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/49559.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/check_compare_by_value.cc:
	Likewise.
	* testsuite/25_algorithms/stable_sort/mem_check.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/moveable.cc: Likewise.
	* testsuite/25_algorithms/stable_sort/moveable2.cc: Likewise.
	* testsuite/25_algorithms/swap_ranges/1.cc: Likewise.
	* testsuite/25_algorithms/unique/11480.cc: Likewise.
	* testsuite/25_algorithms/unique/2.cc: Likewise.
	* testsuite/25_algorithms/unique/moveable.cc: Likewise.
	* testsuite/25_algorithms/unique_copy/1.cc: Likewise.
	* testsuite/25_algorithms/unique_copy/2.cc: Likewise.
	* testsuite/25_algorithms/unique_copy/26133.cc: Likewise.
	* testsuite/25_algorithms/upper_bound/2.cc: Likewise.
	* testsuite/25_algorithms/upper_bound/partitioned.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/basic/string_01.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/basic/
	string_range_00_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/basic/
	string_range_01_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/basic/
	string_range_02_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/
	anymatcher.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	cstring_questionmark.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	cstring_range.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/string_any.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	string_range_00_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	string_range_01_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	string_range_02_03.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_match/extended/
	wstring_locale.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_search/61720.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_search/basic/string_01.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc:
	Likewise.
	* testsuite/28_regex/algorithms/regex_search/ecma/flags.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc: Likewise.
	* testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc:
	Likewise.
	* testsuite/28_regex/basic_regex/assign/char/cstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/cstring_op.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/moveable.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/pstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/range.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/string.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/char/string_op.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/range.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/string.cc: Likewise.
	* testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc:
	Likewise.
	* testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc:
	Likewise.
	* testsuite/28_regex/basic_regex/ctors/extended/cstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/extended/
	string_range_01_02_03.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/move_char.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc: Likewise.
	* testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc: Likewise.
	* testsuite/28_regex/basic_regex/imbue/string.cc: Likewise.
	* testsuite/28_regex/constants/error_type.cc: Likewise.
	* testsuite/28_regex/constants/match_flag_type.cc: Likewise.
	* testsuite/28_regex/init-list.cc: Likewise.
	* testsuite/28_regex/iterators/regex_iterator/char/64140.cc: Likewise.
	* testsuite/28_regex/iterators/regex_iterator/char/string_01.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_iterator/char/
	string_position_01.cc
	* testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/
	default.cc: Likewise.
	* testsuite/28_regex/iterators/regex_iterator/typedefs.cc: Likewise.
	* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/64303.cc: Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/ctors/char/
	default.cc: Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/
	default.cc: Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc:
	Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/wchar_t/
	string_01.cc: Likewise.
	* testsuite/28_regex/iterators/regex_token_iterator/wchar_t/
	wstring_02.cc: Likewise.
	* testsuite/28_regex/match_results/ctors/char/default.cc: Likewise.
	* testsuite/28_regex/match_results/ctors/wchar_t/default.cc: Likewise.
	* testsuite/28_regex/match_results/format.cc: Likewise.
	* testsuite/28_regex/match_results/out_of_range_submatches.cc: Likewise.
	* testsuite/28_regex/match_results/swap.cc: Likewise.
	* testsuite/28_regex/match_results/typedefs.cc: Likewise.
	* testsuite/28_regex/regex_error/regex_error.cc: Likewise.
	* testsuite/28_regex/regression.cc: Likewise.
	* testsuite/28_regex/sub_match/cast_char.cc: Likewise.
	* testsuite/28_regex/sub_match/cast_wchar_t.cc: Likewise.
	* testsuite/28_regex/sub_match/embedded_zeros_cmp.cc: Likewise.
	* testsuite/28_regex/sub_match/length.cc: Likewise.
	* testsuite/28_regex/traits/char/ctor.cc: Likewise.
	* testsuite/28_regex/traits/char/isctype.cc: Likewise.
	* testsuite/28_regex/traits/char/length.cc: Likewise.
	* testsuite/28_regex/traits/char/lookup_classname.cc: Likewise.
	* testsuite/28_regex/traits/char/lookup_collatename.cc: Likewise.
	* testsuite/28_regex/traits/char/transform.cc: Likewise.
	* testsuite/28_regex/traits/char/transform_primary.cc: Likewise.
	* testsuite/28_regex/traits/char/translate.cc: Likewise.
	* testsuite/28_regex/traits/char/translate_nocase.cc: Likewise.
	* testsuite/28_regex/traits/char/user_defined.cc: Likewise.
	* testsuite/28_regex/traits/char/value.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/ctor.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/isctype.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/length.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/lookup_classname.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/lookup_collatename.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/transform.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/transform_primary.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/translate.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/translate_nocase.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/user_defined.cc: Likewise.
	* testsuite/28_regex/traits/wchar_t/value.cc: Likewise.
	* testsuite/29_atomics/atomic/60658.cc: Likewise.
	* testsuite/29_atomics/atomic/operators/51811.cc: Likewise.
	* testsuite/29_atomics/atomic_flag/clear/1.cc: Likewise.
	* testsuite/backward/11460.cc: Likewise.
	* testsuite/backward/hash_map/1.cc: Likewise.
	* testsuite/backward/hash_map/25896.cc: Likewise.
	* testsuite/backward/hash_set/1.cc: Likewise.
	* testsuite/backward/hash_set/25896.cc: Likewise.
	* testsuite/decimal/binary-arith.cc: Likewise.
	* testsuite/decimal/comparison.cc: Likewise.
	* testsuite/decimal/compound-assignment-memfunc.cc: Likewise.
	* testsuite/decimal/compound-assignment.cc: Likewise.
	* testsuite/decimal/conversion-from-float.cc: Likewise.
	* testsuite/decimal/conversion-from-integral.cc: Likewise.
	* testsuite/decimal/conversion-to-generic-float.cc: Likewise.
	* testsuite/decimal/conversion-to-integral.cc: Likewise.
	* testsuite/decimal/ctor.cc: Likewise.
	* testsuite/decimal/incdec-memfunc.cc: Likewise.
	* testsuite/decimal/incdec.cc: Likewise.
	* testsuite/decimal/make-decimal.cc: Likewise.
	* testsuite/decimal/pr54036-1.cc: Likewise.
	* testsuite/decimal/pr54036-2.cc: Likewise.
	* testsuite/decimal/pr54036-3.cc: Likewise.
	* testsuite/decimal/unary-arith.cc: Likewise.
	* testsuite/special_functions/01_assoc_laguerre/check_nan.cc: Likewise.
	* testsuite/special_functions/01_assoc_laguerre/check_value.cc:
	Likewise.
	* testsuite/special_functions/02_assoc_legendre/check_nan.cc: Likewise.
	* testsuite/special_functions/02_assoc_legendre/check_value.cc:
	Likewise.
	* testsuite/special_functions/03_beta/check_nan.cc: Likewise.
	* testsuite/special_functions/03_beta/check_value.cc: Likewise.
	* testsuite/special_functions/04_comp_ellint_1/check_nan.cc: Likewise.
	* testsuite/special_functions/04_comp_ellint_1/check_value.cc: Likewise.
	* testsuite/special_functions/05_comp_ellint_2/check_nan.cc: Likewise.
	* testsuite/special_functions/05_comp_ellint_2/check_value.cc: Likewise.
	* testsuite/special_functions/06_comp_ellint_3/check_nan.cc: Likewise.
	* testsuite/special_functions/06_comp_ellint_3/check_value.cc: Likewise.
	* testsuite/special_functions/07_cyl_bessel_i/check_nan.cc: Likewise.
	* testsuite/special_functions/07_cyl_bessel_i/check_value.cc: Likewise.
	* testsuite/special_functions/07_cyl_bessel_i/pr56216.cc: Likewise.
	* testsuite/special_functions/08_cyl_bessel_j/check_nan.cc: Likewise.
	* testsuite/special_functions/08_cyl_bessel_j/check_value.cc: Likewise.
	* testsuite/special_functions/09_cyl_bessel_k/check_nan.cc: Likewise.
	* testsuite/special_functions/09_cyl_bessel_k/check_value.cc: Likewise.
	* testsuite/special_functions/10_cyl_neumann/check_nan.cc: Likewise.
	* testsuite/special_functions/10_cyl_neumann/check_value.cc: Likewise.
	* testsuite/special_functions/11_ellint_1/check_nan.cc: Likewise.
	* testsuite/special_functions/11_ellint_1/check_value.cc: Likewise.
	* testsuite/special_functions/12_ellint_2/check_nan.cc: Likewise.
	* testsuite/special_functions/12_ellint_2/check_value.cc: Likewise.
	* testsuite/special_functions/13_ellint_3/check_nan.cc: Likewise.
	* testsuite/special_functions/13_ellint_3/check_value.cc: Likewise.
	* testsuite/special_functions/14_expint/check_nan.cc: Likewise.
	* testsuite/special_functions/14_expint/check_value.cc: Likewise.
	* testsuite/special_functions/15_hermite/check_nan.cc: Likewise.
	* testsuite/special_functions/15_hermite/check_value.cc: Likewise.
	* testsuite/special_functions/16_laguerre/check_nan.cc: Likewise.
	* testsuite/special_functions/16_laguerre/check_value.cc: Likewise.
	* testsuite/special_functions/17_legendre/check_nan.cc: Likewise.
	* testsuite/special_functions/17_legendre/check_value.cc: Likewise.
	* testsuite/special_functions/18_riemann_zeta/check_nan.cc: Likewise.
	* testsuite/special_functions/18_riemann_zeta/check_value.cc: Likewise.
	* testsuite/special_functions/19_sph_bessel/check_nan.cc: Likewise.
	* testsuite/special_functions/19_sph_bessel/check_value.cc: Likewise.
	* testsuite/special_functions/20_sph_legendre/check_nan.cc: Likewise.
	* testsuite/special_functions/20_sph_legendre/check_value.cc: Likewise.
	* testsuite/special_functions/21_sph_neumann/check_nan.cc: Likewise.
	* testsuite/special_functions/21_sph_neumann/check_value.cc: Likewise.
	* testsuite/tr2/bases/value.cc: Likewise.
	* testsuite/tr2/direct_bases/value.cc: Likewise.
	* testsuite/util/debug/checks.h: Likewise.
	* testsuite/util/debug/unordered_checks.h: Likewise.
	* testsuite/util/testsuite_allocator.h: Likewise.
	* testsuite/util/testsuite_api.h: Likewise.
	* testsuite/util/testsuite_common_types.h: Likewise.
	* testsuite/util/testsuite_random.h: Likewise.
	* testsuite/util/testsuite_rvalref.h: Likewise.

From-SVN: r241138
---
 libstdc++-v3/ChangeLog                             | 400 +++++++++++++++++++++
 .../testsuite/24_iterators/container_access.cc     |   2 -
 .../testsuite/24_iterators/istream_iterator/2.cc   |   1 -
 .../24_iterators/istreambuf_iterator/2.cc          |   4 +-
 .../24_iterators/istreambuf_iterator/2627.cc       |   1 -
 .../testsuite/24_iterators/operations/next.cc      |   2 -
 .../testsuite/24_iterators/operations/prev.cc      |   2 -
 .../24_iterators/ostreambuf_iterator/2.cc          |   4 +-
 .../24_iterators/random_access_iterator/26020.cc   |   1 -
 .../testsuite/24_iterators/range_access_cpp14.cc   |   2 -
 .../24_iterators/reverse_iterator/11729.cc         |   2 -
 .../testsuite/24_iterators/reverse_iterator/3.cc   |   2 -
 .../25_algorithms/adjacent_find/vectorbool.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/all_of/1.cc   |   6 -
 libstdc++-v3/testsuite/25_algorithms/any_of/1.cc   |   6 -
 .../testsuite/25_algorithms/binary_search/2.cc     |   2 -
 .../25_algorithms/binary_search/partitioned.cc     |   2 -
 libstdc++-v3/testsuite/25_algorithms/clamp/1.cc    |   2 -
 libstdc++-v3/testsuite/25_algorithms/clamp/2.cc    |   2 -
 libstdc++-v3/testsuite/25_algorithms/copy/1.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy/2.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy/3.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy/34595.cc |   2 -
 libstdc++-v3/testsuite/25_algorithms/copy/4.cc     |   1 -
 .../25_algorithms/copy/deque_iterators/1.cc        |   1 -
 .../25_algorithms/copy/move_iterators/1.cc         |   2 -
 .../copy/streambuf_iterators/char/1.cc             |   1 -
 .../copy/streambuf_iterators/char/2.cc             |   1 -
 .../copy/streambuf_iterators/char/3.cc             |   1 -
 .../copy/streambuf_iterators/char/4.cc             |   1 -
 .../copy/streambuf_iterators/wchar_t/1.cc          |   1 -
 .../copy/streambuf_iterators/wchar_t/2.cc          |   1 -
 .../copy/streambuf_iterators/wchar_t/3.cc          |   1 -
 .../copy/streambuf_iterators/wchar_t/4.cc          |   1 -
 .../copy_backward/deque_iterators/1.cc             |   1 -
 .../copy_backward/move_iterators/1.cc              |   2 -
 libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc   |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc   |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc   |   1 -
 libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc   |   1 -
 .../testsuite/25_algorithms/copy_n/50119.cc        |   1 -
 .../25_algorithms/copy_n/move_iterators/1.cc       |   2 -
 .../testsuite/25_algorithms/equal_range/2.cc       |   2 -
 .../25_algorithms/equal_range/partitioned.cc       |   2 -
 libstdc++-v3/testsuite/25_algorithms/fill/1.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/fill/2.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/fill/3.cc     |   2 -
 libstdc++-v3/testsuite/25_algorithms/fill/4.cc     |   1 -
 libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc   |   1 -
 libstdc++-v3/testsuite/25_algorithms/find/39546.cc |   2 -
 .../find/istreambuf_iterators/char/1.cc            |   1 -
 .../find/istreambuf_iterators/char/2.cc            |   1 -
 .../find/istreambuf_iterators/wchar_t/1.cc         |   1 -
 .../find/istreambuf_iterators/wchar_t/2.cc         |   1 -
 libstdc++-v3/testsuite/25_algorithms/find_if/1.cc  |   6 -
 .../testsuite/25_algorithms/find_if_not/1.cc       |   6 -
 libstdc++-v3/testsuite/25_algorithms/for_each/1.cc |   1 -
 libstdc++-v3/testsuite/25_algorithms/heap/1.cc     |   4 -
 .../testsuite/25_algorithms/heap/moveable.cc       |   8 -
 .../testsuite/25_algorithms/heap/moveable2.cc      |   8 -
 .../testsuite/25_algorithms/heap/vectorbool.cc     |   4 -
 libstdc++-v3/testsuite/25_algorithms/includes/1.cc |   5 -
 .../testsuite/25_algorithms/inplace_merge/1.cc     |   4 -
 .../testsuite/25_algorithms/inplace_merge/49559.cc |   2 -
 .../25_algorithms/inplace_merge/moveable.cc        |   2 -
 .../25_algorithms/inplace_merge/moveable2.cc       |   2 -
 libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc  |   2 -
 .../testsuite/25_algorithms/is_heap_until/1.cc     |   2 -
 .../testsuite/25_algorithms/is_partitioned/1.cc    |   8 -
 .../testsuite/25_algorithms/is_permutation/1.cc    |   4 -
 .../testsuite/25_algorithms/is_permutation/2.cc    |   4 -
 .../25_algorithms/is_permutation/vectorbool.cc     |   4 -
 .../testsuite/25_algorithms/is_sorted/1.cc         |   2 -
 .../testsuite/25_algorithms/is_sorted_until/1.cc   |   2 -
 .../testsuite/25_algorithms/iter_swap/20577.cc     |   6 -
 .../testsuite/25_algorithms/lower_bound/2.cc       |   2 -
 .../25_algorithms/lower_bound/partitioned.cc       |   4 -
 .../25_algorithms/make_heap/complexity.cc          |   2 -
 libstdc++-v3/testsuite/25_algorithms/max/1.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/max/2.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/max/3.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/max/37547.cc  |   2 -
 libstdc++-v3/testsuite/25_algorithms/max/4.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/min/1.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/min/2.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/min/3.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/min/37547.cc  |   2 -
 libstdc++-v3/testsuite/25_algorithms/min/4.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/minmax/1.cc   |   2 -
 libstdc++-v3/testsuite/25_algorithms/minmax/2.cc   |   2 -
 libstdc++-v3/testsuite/25_algorithms/minmax/3.cc   |   2 -
 .../testsuite/25_algorithms/minmax/37547.cc        |   2 -
 .../testsuite/25_algorithms/minmax_element/1.cc    |  16 -
 libstdc++-v3/testsuite/25_algorithms/move/1.cc     |   2 -
 .../25_algorithms/move/deque_iterators/1.cc        |   1 -
 .../testsuite/25_algorithms/move_backward/1.cc     |   2 -
 .../move_backward/deque_iterators/1.cc             |   1 -
 .../25_algorithms/next_permutation/moveable.cc     |  10 -
 libstdc++-v3/testsuite/25_algorithms/none_of/1.cc  |   6 -
 .../testsuite/25_algorithms/nth_element/1.cc       |   2 -
 .../testsuite/25_algorithms/nth_element/2.cc       |   2 -
 .../testsuite/25_algorithms/nth_element/3.cc       |   2 -
 .../25_algorithms/nth_element/moveable.cc          |   6 -
 .../25_algorithms/nth_element/random_test.cc       |   2 -
 .../testsuite/25_algorithms/partial_sort/2.cc      |   2 -
 .../partial_sort/check_compare_by_value.cc         |   6 -
 .../25_algorithms/partial_sort/moveable.cc         |   6 -
 .../25_algorithms/partial_sort/random_test.cc      |   2 -
 .../testsuite/25_algorithms/partial_sort_copy/2.cc |   2 -
 .../25_algorithms/partial_sort_copy/random_test.cc |   2 -
 .../testsuite/25_algorithms/partition/1.cc         |   2 -
 .../testsuite/25_algorithms/partition/moveable.cc  |   2 -
 .../testsuite/25_algorithms/partition_copy/1.cc    |   6 -
 .../testsuite/25_algorithms/partition_point/1.cc   |   6 -
 .../testsuite/25_algorithms/pop_heap/complexity.cc |   2 -
 .../25_algorithms/prev_permutation/moveable.cc     |  10 -
 .../25_algorithms/push_heap/complexity.cc          |   2 -
 .../testsuite/25_algorithms/random_shuffle/1.cc    |   2 -
 .../25_algorithms/random_shuffle/moveable.cc       |   4 -
 libstdc++-v3/testsuite/25_algorithms/rotate/1.cc   |   5 -
 .../testsuite/25_algorithms/rotate/moveable.cc     |   1 -
 .../testsuite/25_algorithms/rotate/moveable2.cc    |   2 -
 .../testsuite/25_algorithms/rotate/rotate.cc       |   4 +-
 libstdc++-v3/testsuite/25_algorithms/search/1.cc   |   6 -
 .../testsuite/25_algorithms/search_n/58358.cc      |   2 -
 libstdc++-v3/testsuite/25_algorithms/shuffle/1.cc  |   2 -
 libstdc++-v3/testsuite/25_algorithms/sort/1.cc     |   2 -
 .../25_algorithms/sort/check_compare_by_value.cc   |   6 -
 .../testsuite/25_algorithms/sort/moveable.cc       |   4 -
 .../testsuite/25_algorithms/sort/random_test.cc    |   2 -
 .../testsuite/25_algorithms/sort/vectorbool.cc     |   2 -
 .../sort_heap/check_compare_by_value.cc            |   6 -
 .../25_algorithms/sort_heap/complexity.cc          |   2 -
 .../testsuite/25_algorithms/stable_partition/1.cc  |   2 -
 .../25_algorithms/stable_partition/mem_check.cc    |   2 -
 .../25_algorithms/stable_partition/moveable.cc     |   4 -
 .../testsuite/25_algorithms/stable_sort/2.cc       |   2 -
 .../testsuite/25_algorithms/stable_sort/3.cc       |   2 -
 .../testsuite/25_algorithms/stable_sort/49559.cc   |   2 -
 .../stable_sort/check_compare_by_value.cc          |   6 -
 .../25_algorithms/stable_sort/mem_check.cc         |   4 -
 .../25_algorithms/stable_sort/moveable.cc          |   2 -
 .../25_algorithms/stable_sort/moveable2.cc         |   2 -
 .../testsuite/25_algorithms/swap_ranges/1.cc       |   2 -
 .../testsuite/25_algorithms/unique/11480.cc        |   2 -
 libstdc++-v3/testsuite/25_algorithms/unique/2.cc   |   3 -
 .../testsuite/25_algorithms/unique/moveable.cc     |   4 -
 .../testsuite/25_algorithms/unique_copy/1.cc       |   4 -
 .../testsuite/25_algorithms/unique_copy/2.cc       |   4 -
 .../testsuite/25_algorithms/unique_copy/26133.cc   |   1 -
 .../testsuite/25_algorithms/upper_bound/2.cc       |   2 -
 .../25_algorithms/upper_bound/partitioned.cc       |   4 -
 .../algorithms/regex_match/awk/cstring_01.cc       |   2 -
 .../algorithms/regex_match/basic/empty_range.cc    |   2 -
 .../algorithms/regex_match/basic/string_01.cc      |  38 +-
 .../regex_match/basic/string_range_00_03.cc        |  36 +-
 .../regex_match/basic/string_range_01_03.cc        |  36 +-
 .../regex_match/basic/string_range_02_03.cc        |  36 +-
 .../algorithms/regex_match/cstring_bracket_01.cc   |  12 -
 .../algorithms/regex_match/ecma/char/53622.cc      |   2 -
 .../algorithms/regex_match/ecma/char/57173.cc      |   2 -
 .../algorithms/regex_match/ecma/char/58576.cc      |   2 -
 .../algorithms/regex_match/ecma/char/68863.cc      |   2 -
 .../algorithms/regex_match/ecma/char/anymatcher.cc |   2 -
 .../algorithms/regex_match/ecma/char/backref.cc    |   2 -
 .../regex_match/ecma/char/empty_range.cc           |   2 -
 .../algorithms/regex_match/ecma/char/emptygroup.cc |   2 -
 .../algorithms/regex_match/ecma/char/hex.cc        |   2 -
 .../regex_match/ecma/char/quoted_char.cc           |   2 -
 .../algorithms/regex_match/ecma/char/ungreedy.cc   |   2 -
 .../algorithms/regex_match/ecma/wchar_t/63199.cc   |   2 -
 .../regex_match/ecma/wchar_t/anymatcher.cc         |   2 -
 .../regex_match/ecma/wchar_t/cjk_match.cc          |   2 -
 .../algorithms/regex_match/ecma/wchar_t/hex.cc     |   2 -
 .../regex_match/extended/cstring_plus.cc           |   2 -
 .../regex_match/extended/cstring_questionmark.cc   |   2 -
 .../regex_match/extended/cstring_range.cc          |   2 -
 .../algorithms/regex_match/extended/string_any.cc  |  36 +-
 .../regex_match/extended/string_range_00_03.cc     |   2 -
 .../regex_match/extended/string_range_01_03.cc     |  36 +-
 .../regex_match/extended/string_range_02_03.cc     |  36 +-
 .../regex_match/extended/wstring_locale.cc         |   2 -
 .../algorithms/regex_replace/char/basic_replace.cc |   2 -
 .../algorithms/regex_replace/char/dr2213.cc        |   2 -
 .../28_regex/algorithms/regex_search/61720.cc      |   2 -
 .../algorithms/regex_search/basic/string_01.cc     |   2 -
 .../algorithms/regex_search/ecma/assertion.cc      |   2 -
 .../28_regex/algorithms/regex_search/ecma/flags.cc |   2 -
 .../algorithms/regex_search/ecma/greedy.cc         |   2 -
 .../algorithms/regex_search/ecma/string_01.cc      |   2 -
 .../28_regex/basic_regex/assign/char/cstring.cc    |   2 -
 .../28_regex/basic_regex/assign/char/cstring_op.cc |   1 -
 .../28_regex/basic_regex/assign/char/moveable.cc   |   2 -
 .../28_regex/basic_regex/assign/char/pstring.cc    |   1 -
 .../28_regex/basic_regex/assign/char/range.cc      |   1 -
 .../28_regex/basic_regex/assign/char/string.cc     |   2 -
 .../28_regex/basic_regex/assign/char/string_op.cc  |   1 -
 .../28_regex/basic_regex/assign/wchar_t/cstring.cc |   2 -
 .../basic_regex/assign/wchar_t/cstring_op.cc       |   2 -
 .../28_regex/basic_regex/assign/wchar_t/pstring.cc |   1 -
 .../28_regex/basic_regex/assign/wchar_t/range.cc   |   2 -
 .../28_regex/basic_regex/assign/wchar_t/string.cc  |   2 -
 .../basic_regex/assign/wchar_t/string_op.cc        |   4 +-
 .../basic_regex/ctors/basic/pstring_wchar_t.cc     |   2 -
 .../ctors/basic/string_range_01_02_03.cc           |  18 +-
 .../28_regex/basic_regex/ctors/extended/cstring.cc |   2 -
 .../ctors/extended/string_range_01_02_03.cc        |  18 +-
 .../28_regex/basic_regex/ctors/move_char.cc        |   7 +-
 .../28_regex/basic_regex/ctors/string_wchar_t.cc   |   1 -
 .../28_regex/basic_regex/ctors/wchar_t/cstring.cc  |   2 -
 .../28_regex/basic_regex/ctors/wchar_t/default.cc  |   2 -
 .../28_regex/basic_regex/ctors/wchar_t/range.cc    |   2 -
 .../testsuite/28_regex/basic_regex/imbue/string.cc |   2 -
 .../testsuite/28_regex/constants/error_type.cc     |  31 +-
 .../28_regex/constants/match_flag_type.cc          |  29 +-
 libstdc++-v3/testsuite/28_regex/init-list.cc       |   6 +-
 .../iterators/regex_iterator/char/64140.cc         |   2 -
 .../iterators/regex_iterator/char/string_01.cc     |   2 -
 .../regex_iterator/char/string_position_01.cc      |   6 -
 .../iterators/regex_iterator/ctors/char/default.cc |   1 -
 .../regex_iterator/ctors/wchar_t/default.cc        |   1 -
 .../28_regex/iterators/regex_iterator/typedefs.cc  |   1 -
 .../iterators/regex_iterator/wchar_t/string_01.cc  |   2 -
 .../iterators/regex_iterator/wchar_t/string_02.cc  |   2 -
 .../iterators/regex_token_iterator/64303.cc        |   2 -
 .../regex_token_iterator/char/string_01.cc         |   2 -
 .../regex_token_iterator/ctors/char/default.cc     |   1 -
 .../regex_token_iterator/ctors/wchar_t/default.cc  |   1 -
 .../iterators/regex_token_iterator/typedefs.cc     |   1 -
 .../regex_token_iterator/wchar_t/string_01.cc      |   2 -
 .../regex_token_iterator/wchar_t/wstring_02.cc     |   2 -
 .../28_regex/match_results/ctors/char/default.cc   |   4 -
 .../match_results/ctors/wchar_t/default.cc         |   4 -
 .../testsuite/28_regex/match_results/format.cc     |   4 -
 .../match_results/out_of_range_submatches.cc       |   4 -
 .../testsuite/28_regex/match_results/swap.cc       |   2 -
 .../testsuite/28_regex/match_results/typedefs.cc   |   1 -
 .../testsuite/28_regex/regex_error/regex_error.cc  |  20 +-
 libstdc++-v3/testsuite/28_regex/regression.cc      |  10 -
 .../testsuite/28_regex/sub_match/cast_char.cc      |  14 +-
 .../testsuite/28_regex/sub_match/cast_wchar_t.cc   |  14 +-
 .../28_regex/sub_match/embedded_zeros_cmp.cc       |  32 +-
 .../testsuite/28_regex/sub_match/length.cc         |  18 +-
 .../testsuite/28_regex/traits/char/ctor.cc         |   2 -
 .../testsuite/28_regex/traits/char/isctype.cc      |   1 -
 .../testsuite/28_regex/traits/char/length.cc       |   9 +-
 .../28_regex/traits/char/lookup_classname.cc       |   9 +-
 .../28_regex/traits/char/lookup_collatename.cc     |   1 -
 .../testsuite/28_regex/traits/char/transform.cc    |  11 +-
 .../28_regex/traits/char/transform_primary.cc      |   9 +-
 .../testsuite/28_regex/traits/char/translate.cc    |   1 -
 .../28_regex/traits/char/translate_nocase.cc       |   1 -
 .../testsuite/28_regex/traits/char/user_defined.cc |   2 -
 .../testsuite/28_regex/traits/char/value.cc        |   1 -
 .../testsuite/28_regex/traits/wchar_t/ctor.cc      |   1 -
 .../testsuite/28_regex/traits/wchar_t/isctype.cc   |   1 -
 .../testsuite/28_regex/traits/wchar_t/length.cc    |   9 +-
 .../28_regex/traits/wchar_t/lookup_classname.cc    |   1 -
 .../28_regex/traits/wchar_t/lookup_collatename.cc  |   5 +-
 .../testsuite/28_regex/traits/wchar_t/transform.cc |  11 +-
 .../28_regex/traits/wchar_t/transform_primary.cc   |  13 +-
 .../testsuite/28_regex/traits/wchar_t/translate.cc |   5 +-
 .../28_regex/traits/wchar_t/translate_nocase.cc    |   1 -
 .../28_regex/traits/wchar_t/user_defined.cc        |   2 -
 .../testsuite/28_regex/traits/wchar_t/value.cc     |   1 -
 libstdc++-v3/testsuite/29_atomics/atomic/60658.cc  |   2 -
 .../testsuite/29_atomics/atomic/operators/51811.cc |   2 -
 .../testsuite/29_atomics/atomic_flag/clear/1.cc    |   1 -
 libstdc++-v3/testsuite/backward/11460.cc           |   2 -
 libstdc++-v3/testsuite/backward/hash_map/1.cc      |   1 -
 libstdc++-v3/testsuite/backward/hash_map/25896.cc  |   2 -
 libstdc++-v3/testsuite/backward/hash_set/1.cc      |   1 -
 libstdc++-v3/testsuite/backward/hash_set/25896.cc  |   2 -
 libstdc++-v3/testsuite/decimal/binary-arith.cc     |  12 -
 libstdc++-v3/testsuite/decimal/comparison.cc       |  18 -
 .../decimal/compound-assignment-memfunc.cc         |  12 -
 .../testsuite/decimal/compound-assignment.cc       |  12 -
 .../testsuite/decimal/conversion-from-float.cc     |   3 -
 .../testsuite/decimal/conversion-from-integral.cc  |   6 -
 .../decimal/conversion-to-generic-float.cc         |   3 -
 .../testsuite/decimal/conversion-to-integral.cc    |   3 -
 libstdc++-v3/testsuite/decimal/ctor.cc             |   3 -
 libstdc++-v3/testsuite/decimal/incdec-memfunc.cc   |   3 -
 libstdc++-v3/testsuite/decimal/incdec.cc           |   3 -
 libstdc++-v3/testsuite/decimal/make-decimal.cc     |   3 -
 libstdc++-v3/testsuite/decimal/pr54036-1.cc        |   1 -
 libstdc++-v3/testsuite/decimal/pr54036-2.cc        |   1 -
 libstdc++-v3/testsuite/decimal/pr54036-3.cc        |   1 -
 libstdc++-v3/testsuite/decimal/unary-arith.cc      |   6 -
 .../01_assoc_laguerre/check_nan.cc                 |   1 -
 .../01_assoc_laguerre/check_value.cc               |   1 -
 .../02_assoc_legendre/check_nan.cc                 |   1 -
 .../02_assoc_legendre/check_value.cc               |   1 -
 .../special_functions/03_beta/check_nan.cc         |   2 -
 .../special_functions/03_beta/check_value.cc       |   1 -
 .../04_comp_ellint_1/check_nan.cc                  |   1 -
 .../04_comp_ellint_1/check_value.cc                |   1 -
 .../05_comp_ellint_2/check_nan.cc                  |   1 -
 .../05_comp_ellint_2/check_value.cc                |   1 -
 .../06_comp_ellint_3/check_nan.cc                  |   2 -
 .../06_comp_ellint_3/check_value.cc                |   1 -
 .../special_functions/07_cyl_bessel_i/check_nan.cc |   2 -
 .../07_cyl_bessel_i/check_value.cc                 |   1 -
 .../special_functions/07_cyl_bessel_i/pr56216.cc   |   1 -
 .../special_functions/08_cyl_bessel_j/check_nan.cc |   2 -
 .../08_cyl_bessel_j/check_value.cc                 |   1 -
 .../special_functions/09_cyl_bessel_k/check_nan.cc |   2 -
 .../09_cyl_bessel_k/check_value.cc                 |   1 -
 .../special_functions/10_cyl_neumann/check_nan.cc  |   2 -
 .../10_cyl_neumann/check_value.cc                  |   1 -
 .../special_functions/11_ellint_1/check_nan.cc     |   2 -
 .../special_functions/11_ellint_1/check_value.cc   |   1 -
 .../special_functions/12_ellint_2/check_nan.cc     |   2 -
 .../special_functions/12_ellint_2/check_value.cc   |   1 -
 .../special_functions/13_ellint_3/check_nan.cc     |   3 -
 .../special_functions/13_ellint_3/check_value.cc   |   1 -
 .../special_functions/14_expint/check_nan.cc       |   1 -
 .../special_functions/14_expint/check_value.cc     |   1 -
 .../special_functions/15_hermite/check_nan.cc      |   1 -
 .../special_functions/15_hermite/check_value.cc    |   1 -
 .../special_functions/16_laguerre/check_nan.cc     |   1 -
 .../special_functions/16_laguerre/check_value.cc   |   1 -
 .../special_functions/17_legendre/check_nan.cc     |   1 -
 .../special_functions/17_legendre/check_value.cc   |   1 -
 .../special_functions/18_riemann_zeta/check_nan.cc |   1 -
 .../18_riemann_zeta/check_value.cc                 |   1 -
 .../special_functions/19_sph_bessel/check_nan.cc   |   1 -
 .../special_functions/19_sph_bessel/check_value.cc |   1 -
 .../special_functions/20_sph_legendre/check_nan.cc |   1 -
 .../20_sph_legendre/check_value.cc                 |   1 -
 .../special_functions/21_sph_neumann/check_nan.cc  |   1 -
 .../21_sph_neumann/check_value.cc                  |   1 -
 libstdc++-v3/testsuite/tr2/bases/value.cc          |   2 -
 libstdc++-v3/testsuite/tr2/direct_bases/value.cc   |   2 -
 libstdc++-v3/testsuite/util/debug/checks.h         |  22 --
 .../testsuite/util/debug/unordered_checks.h        |   8 -
 libstdc++-v3/testsuite/util/testsuite_allocator.h  |   2 -
 libstdc++-v3/testsuite/util/testsuite_api.h        |   1 -
 .../testsuite/util/testsuite_common_types.h        |   2 -
 libstdc++-v3/testsuite/util/testsuite_random.h     |   1 -
 libstdc++-v3/testsuite/util/testsuite_rvalref.h    |  14 -
 341 files changed, 651 insertions(+), 1100 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c421111..32b59a3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,403 @@
+2016-10-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/24_iterators/container_access.cc: Remove 'test' variables.
+	* testsuite/24_iterators/istream_iterator/2.cc: Likewise.
+	* testsuite/24_iterators/istreambuf_iterator/2.cc: Likewise.
+	* testsuite/24_iterators/istreambuf_iterator/2627.cc: Likewise.
+	* testsuite/24_iterators/operations/next.cc: Likewise.
+	* testsuite/24_iterators/operations/prev.cc: Likewise.
+	* testsuite/24_iterators/ostreambuf_iterator/2.cc: Likewise.
+	* testsuite/24_iterators/random_access_iterator/26020.cc: Likewise.
+	* testsuite/24_iterators/range_access_cpp14.cc: Likewise.
+	* testsuite/24_iterators/reverse_iterator/11729.cc: Likewise.
+	* testsuite/24_iterators/reverse_iterator/3.cc: Likewise.
+	* testsuite/25_algorithms/adjacent_find/vectorbool.cc: Likewise.
+	* testsuite/25_algorithms/all_of/1.cc: Likewise.
+	* testsuite/25_algorithms/any_of/1.cc: Likewise.
+	* testsuite/25_algorithms/binary_search/2.cc: Likewise.
+	* testsuite/25_algorithms/binary_search/partitioned.cc: Likewise.
+	* testsuite/25_algorithms/clamp/1.cc: Likewise.
+	* testsuite/25_algorithms/clamp/2.cc: Likewise.
+	* testsuite/25_algorithms/copy/1.cc: Likewise.
+	* testsuite/25_algorithms/copy/2.cc: Likewise.
+	* testsuite/25_algorithms/copy/3.cc: Likewise.
+	* testsuite/25_algorithms/copy/34595.cc: Likewise.
+	* testsuite/25_algorithms/copy/4.cc: Likewise.
+	* testsuite/25_algorithms/copy/deque_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/copy/move_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc: Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc: Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc: Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc: Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc:
+	Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc:
+	Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc:
+	Likewise.
+	* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc:
+	Likewise.
+	* testsuite/25_algorithms/copy_backward/deque_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/copy_backward/move_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/1.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/2.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/3.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/4.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/50119.cc: Likewise.
+	* testsuite/25_algorithms/copy_n/move_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/equal_range/2.cc: Likewise.
+	* testsuite/25_algorithms/equal_range/partitioned.cc: Likewise.
+	* testsuite/25_algorithms/fill/1.cc: Likewise.
+	* testsuite/25_algorithms/fill/2.cc: Likewise.
+	* testsuite/25_algorithms/fill/3.cc: Likewise.
+	* testsuite/25_algorithms/fill/4.cc: Likewise.
+	* testsuite/25_algorithms/fill_n/1.cc: Likewise.
+	* testsuite/25_algorithms/find/39546.cc: Likewise.
+	* testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc: Likewise.
+	* testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc: Likewise.
+	* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc:
+	Likewise.
+	* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc:
+	Likewise.
+	* testsuite/25_algorithms/find_if/1.cc: Likewise.
+	* testsuite/25_algorithms/find_if_not/1.cc: Likewise.
+	* testsuite/25_algorithms/for_each/1.cc: Likewise.
+	* testsuite/25_algorithms/heap/1.cc: Likewise.
+	* testsuite/25_algorithms/heap/moveable.cc: Likewise.
+	* testsuite/25_algorithms/heap/moveable2.cc: Likewise.
+	* testsuite/25_algorithms/heap/vectorbool.cc: Likewise.
+	* testsuite/25_algorithms/includes/1.cc: Likewise.
+	* testsuite/25_algorithms/inplace_merge/1.cc: Likewise.
+	* testsuite/25_algorithms/inplace_merge/49559.cc: Likewise.
+	* testsuite/25_algorithms/inplace_merge/moveable.cc: Likewise.
+	* testsuite/25_algorithms/inplace_merge/moveable2.cc: Likewise.
+	* testsuite/25_algorithms/is_heap/1.cc: Likewise.
+	* testsuite/25_algorithms/is_heap_until/1.cc: Likewise.
+	* testsuite/25_algorithms/is_partitioned/1.cc: Likewise.
+	* testsuite/25_algorithms/is_permutation/1.cc: Likewise.
+	* testsuite/25_algorithms/is_permutation/2.cc: Likewise.
+	* testsuite/25_algorithms/is_permutation/vectorbool.cc: Likewise.
+	* testsuite/25_algorithms/is_sorted/1.cc: Likewise.
+	* testsuite/25_algorithms/is_sorted_until/1.cc: Likewise.
+	* testsuite/25_algorithms/iter_swap/20577.cc: Likewise.
+	* testsuite/25_algorithms/lower_bound/2.cc: Likewise.
+	* testsuite/25_algorithms/lower_bound/partitioned.cc: Likewise.
+	* testsuite/25_algorithms/make_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/max/1.cc: Likewise.
+	* testsuite/25_algorithms/max/2.cc: Likewise.
+	* testsuite/25_algorithms/max/3.cc: Likewise.
+	* testsuite/25_algorithms/max/37547.cc: Likewise.
+	* testsuite/25_algorithms/max/4.cc: Likewise.
+	* testsuite/25_algorithms/min/1.cc: Likewise.
+	* testsuite/25_algorithms/min/2.cc: Likewise.
+	* testsuite/25_algorithms/min/3.cc: Likewise.
+	* testsuite/25_algorithms/min/37547.cc: Likewise.
+	* testsuite/25_algorithms/min/4.cc: Likewise.
+	* testsuite/25_algorithms/minmax/1.cc: Likewise.
+	* testsuite/25_algorithms/minmax/2.cc: Likewise.
+	* testsuite/25_algorithms/minmax/3.cc: Likewise.
+	* testsuite/25_algorithms/minmax/37547.cc: Likewise.
+	* testsuite/25_algorithms/minmax_element/1.cc: Likewise.
+	* testsuite/25_algorithms/move/1.cc: Likewise.
+	* testsuite/25_algorithms/move/deque_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/move_backward/1.cc: Likewise.
+	* testsuite/25_algorithms/move_backward/deque_iterators/1.cc: Likewise.
+	* testsuite/25_algorithms/next_permutation/moveable.cc: Likewise.
+	* testsuite/25_algorithms/none_of/1.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/1.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/2.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/3.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/moveable.cc: Likewise.
+	* testsuite/25_algorithms/nth_element/random_test.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort/2.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort/check_compare_by_value.cc:
+	Likewise.
+	* testsuite/25_algorithms/partial_sort/moveable.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort/random_test.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort_copy/2.cc: Likewise.
+	* testsuite/25_algorithms/partial_sort_copy/random_test.cc: Likewise.
+	* testsuite/25_algorithms/partition/1.cc: Likewise.
+	* testsuite/25_algorithms/partition/moveable.cc: Likewise.
+	* testsuite/25_algorithms/partition_copy/1.cc: Likewise.
+	* testsuite/25_algorithms/partition_point/1.cc: Likewise.
+	* testsuite/25_algorithms/pop_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/prev_permutation/moveable.cc: Likewise.
+	* testsuite/25_algorithms/push_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/random_shuffle/1.cc: Likewise.
+	* testsuite/25_algorithms/random_shuffle/moveable.cc: Likewise.
+	* testsuite/25_algorithms/rotate/1.cc: Likewise.
+	* testsuite/25_algorithms/rotate/moveable.cc: Likewise.
+	* testsuite/25_algorithms/rotate/moveable2.cc: Likewise.
+	* testsuite/25_algorithms/rotate/rotate.cc: Likewise.
+	* testsuite/25_algorithms/search/1.cc: Likewise.
+	* testsuite/25_algorithms/search_n/58358.cc: Likewise.
+	* testsuite/25_algorithms/shuffle/1.cc: Likewise.
+	* testsuite/25_algorithms/sort/1.cc: Likewise.
+	* testsuite/25_algorithms/sort/check_compare_by_value.cc: Likewise.
+	* testsuite/25_algorithms/sort/moveable.cc: Likewise.
+	* testsuite/25_algorithms/sort/random_test.cc: Likewise.
+	* testsuite/25_algorithms/sort/vectorbool.cc: Likewise.
+	* testsuite/25_algorithms/sort_heap/check_compare_by_value.cc: Likewise.
+	* testsuite/25_algorithms/sort_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/stable_partition/1.cc: Likewise.
+	* testsuite/25_algorithms/stable_partition/mem_check.cc: Likewise.
+	* testsuite/25_algorithms/stable_partition/moveable.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/2.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/3.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/49559.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/check_compare_by_value.cc:
+	Likewise.
+	* testsuite/25_algorithms/stable_sort/mem_check.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/moveable.cc: Likewise.
+	* testsuite/25_algorithms/stable_sort/moveable2.cc: Likewise.
+	* testsuite/25_algorithms/swap_ranges/1.cc: Likewise.
+	* testsuite/25_algorithms/unique/11480.cc: Likewise.
+	* testsuite/25_algorithms/unique/2.cc: Likewise.
+	* testsuite/25_algorithms/unique/moveable.cc: Likewise.
+	* testsuite/25_algorithms/unique_copy/1.cc: Likewise.
+	* testsuite/25_algorithms/unique_copy/2.cc: Likewise.
+	* testsuite/25_algorithms/unique_copy/26133.cc: Likewise.
+	* testsuite/25_algorithms/upper_bound/2.cc: Likewise.
+	* testsuite/25_algorithms/upper_bound/partitioned.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/basic/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/basic/
+	string_range_00_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/basic/
+	string_range_01_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/basic/
+	string_range_02_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/
+	anymatcher.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	cstring_questionmark.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	cstring_range.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/string_any.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	string_range_00_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	string_range_01_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	string_range_02_03.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_match/extended/
+	wstring_locale.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_search/61720.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_search/basic/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc:
+	Likewise.
+	* testsuite/28_regex/algorithms/regex_search/ecma/flags.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc: Likewise.
+	* testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/cstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/cstring_op.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/moveable.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/pstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/range.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/string.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/char/string_op.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/range.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/string.cc: Likewise.
+	* testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc:
+	Likewise.
+	* testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc:
+	Likewise.
+	* testsuite/28_regex/basic_regex/ctors/extended/cstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/extended/
+	string_range_01_02_03.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/move_char.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc: Likewise.
+	* testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc: Likewise.
+	* testsuite/28_regex/basic_regex/imbue/string.cc: Likewise.
+	* testsuite/28_regex/constants/error_type.cc: Likewise.
+	* testsuite/28_regex/constants/match_flag_type.cc: Likewise.
+	* testsuite/28_regex/init-list.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/char/64140.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/char/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/char/
+	string_position_01.cc
+	* testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/
+	default.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/typedefs.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/64303.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/ctors/char/
+	default.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/
+	default.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc:
+	Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/wchar_t/
+	string_01.cc: Likewise.
+	* testsuite/28_regex/iterators/regex_token_iterator/wchar_t/
+	wstring_02.cc: Likewise.
+	* testsuite/28_regex/match_results/ctors/char/default.cc: Likewise.
+	* testsuite/28_regex/match_results/ctors/wchar_t/default.cc: Likewise.
+	* testsuite/28_regex/match_results/format.cc: Likewise.
+	* testsuite/28_regex/match_results/out_of_range_submatches.cc: Likewise.
+	* testsuite/28_regex/match_results/swap.cc: Likewise.
+	* testsuite/28_regex/match_results/typedefs.cc: Likewise.
+	* testsuite/28_regex/regex_error/regex_error.cc: Likewise.
+	* testsuite/28_regex/regression.cc: Likewise.
+	* testsuite/28_regex/sub_match/cast_char.cc: Likewise.
+	* testsuite/28_regex/sub_match/cast_wchar_t.cc: Likewise.
+	* testsuite/28_regex/sub_match/embedded_zeros_cmp.cc: Likewise.
+	* testsuite/28_regex/sub_match/length.cc: Likewise.
+	* testsuite/28_regex/traits/char/ctor.cc: Likewise.
+	* testsuite/28_regex/traits/char/isctype.cc: Likewise.
+	* testsuite/28_regex/traits/char/length.cc: Likewise.
+	* testsuite/28_regex/traits/char/lookup_classname.cc: Likewise.
+	* testsuite/28_regex/traits/char/lookup_collatename.cc: Likewise.
+	* testsuite/28_regex/traits/char/transform.cc: Likewise.
+	* testsuite/28_regex/traits/char/transform_primary.cc: Likewise.
+	* testsuite/28_regex/traits/char/translate.cc: Likewise.
+	* testsuite/28_regex/traits/char/translate_nocase.cc: Likewise.
+	* testsuite/28_regex/traits/char/user_defined.cc: Likewise.
+	* testsuite/28_regex/traits/char/value.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/ctor.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/isctype.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/length.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/lookup_classname.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/lookup_collatename.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/transform.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/transform_primary.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/translate.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/translate_nocase.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/user_defined.cc: Likewise.
+	* testsuite/28_regex/traits/wchar_t/value.cc: Likewise.
+	* testsuite/29_atomics/atomic/60658.cc: Likewise.
+	* testsuite/29_atomics/atomic/operators/51811.cc: Likewise.
+	* testsuite/29_atomics/atomic_flag/clear/1.cc: Likewise.
+	* testsuite/backward/11460.cc: Likewise.
+	* testsuite/backward/hash_map/1.cc: Likewise.
+	* testsuite/backward/hash_map/25896.cc: Likewise.
+	* testsuite/backward/hash_set/1.cc: Likewise.
+	* testsuite/backward/hash_set/25896.cc: Likewise.
+	* testsuite/decimal/binary-arith.cc: Likewise.
+	* testsuite/decimal/comparison.cc: Likewise.
+	* testsuite/decimal/compound-assignment-memfunc.cc: Likewise.
+	* testsuite/decimal/compound-assignment.cc: Likewise.
+	* testsuite/decimal/conversion-from-float.cc: Likewise.
+	* testsuite/decimal/conversion-from-integral.cc: Likewise.
+	* testsuite/decimal/conversion-to-generic-float.cc: Likewise.
+	* testsuite/decimal/conversion-to-integral.cc: Likewise.
+	* testsuite/decimal/ctor.cc: Likewise.
+	* testsuite/decimal/incdec-memfunc.cc: Likewise.
+	* testsuite/decimal/incdec.cc: Likewise.
+	* testsuite/decimal/make-decimal.cc: Likewise.
+	* testsuite/decimal/pr54036-1.cc: Likewise.
+	* testsuite/decimal/pr54036-2.cc: Likewise.
+	* testsuite/decimal/pr54036-3.cc: Likewise.
+	* testsuite/decimal/unary-arith.cc: Likewise.
+	* testsuite/special_functions/01_assoc_laguerre/check_nan.cc: Likewise.
+	* testsuite/special_functions/01_assoc_laguerre/check_value.cc:
+	Likewise.
+	* testsuite/special_functions/02_assoc_legendre/check_nan.cc: Likewise.
+	* testsuite/special_functions/02_assoc_legendre/check_value.cc:
+	Likewise.
+	* testsuite/special_functions/03_beta/check_nan.cc: Likewise.
+	* testsuite/special_functions/03_beta/check_value.cc: Likewise.
+	* testsuite/special_functions/04_comp_ellint_1/check_nan.cc: Likewise.
+	* testsuite/special_functions/04_comp_ellint_1/check_value.cc: Likewise.
+	* testsuite/special_functions/05_comp_ellint_2/check_nan.cc: Likewise.
+	* testsuite/special_functions/05_comp_ellint_2/check_value.cc: Likewise.
+	* testsuite/special_functions/06_comp_ellint_3/check_nan.cc: Likewise.
+	* testsuite/special_functions/06_comp_ellint_3/check_value.cc: Likewise.
+	* testsuite/special_functions/07_cyl_bessel_i/check_nan.cc: Likewise.
+	* testsuite/special_functions/07_cyl_bessel_i/check_value.cc: Likewise.
+	* testsuite/special_functions/07_cyl_bessel_i/pr56216.cc: Likewise.
+	* testsuite/special_functions/08_cyl_bessel_j/check_nan.cc: Likewise.
+	* testsuite/special_functions/08_cyl_bessel_j/check_value.cc: Likewise.
+	* testsuite/special_functions/09_cyl_bessel_k/check_nan.cc: Likewise.
+	* testsuite/special_functions/09_cyl_bessel_k/check_value.cc: Likewise.
+	* testsuite/special_functions/10_cyl_neumann/check_nan.cc: Likewise.
+	* testsuite/special_functions/10_cyl_neumann/check_value.cc: Likewise.
+	* testsuite/special_functions/11_ellint_1/check_nan.cc: Likewise.
+	* testsuite/special_functions/11_ellint_1/check_value.cc: Likewise.
+	* testsuite/special_functions/12_ellint_2/check_nan.cc: Likewise.
+	* testsuite/special_functions/12_ellint_2/check_value.cc: Likewise.
+	* testsuite/special_functions/13_ellint_3/check_nan.cc: Likewise.
+	* testsuite/special_functions/13_ellint_3/check_value.cc: Likewise.
+	* testsuite/special_functions/14_expint/check_nan.cc: Likewise.
+	* testsuite/special_functions/14_expint/check_value.cc: Likewise.
+	* testsuite/special_functions/15_hermite/check_nan.cc: Likewise.
+	* testsuite/special_functions/15_hermite/check_value.cc: Likewise.
+	* testsuite/special_functions/16_laguerre/check_nan.cc: Likewise.
+	* testsuite/special_functions/16_laguerre/check_value.cc: Likewise.
+	* testsuite/special_functions/17_legendre/check_nan.cc: Likewise.
+	* testsuite/special_functions/17_legendre/check_value.cc: Likewise.
+	* testsuite/special_functions/18_riemann_zeta/check_nan.cc: Likewise.
+	* testsuite/special_functions/18_riemann_zeta/check_value.cc: Likewise.
+	* testsuite/special_functions/19_sph_bessel/check_nan.cc: Likewise.
+	* testsuite/special_functions/19_sph_bessel/check_value.cc: Likewise.
+	* testsuite/special_functions/20_sph_legendre/check_nan.cc: Likewise.
+	* testsuite/special_functions/20_sph_legendre/check_value.cc: Likewise.
+	* testsuite/special_functions/21_sph_neumann/check_nan.cc: Likewise.
+	* testsuite/special_functions/21_sph_neumann/check_value.cc: Likewise.
+	* testsuite/tr2/bases/value.cc: Likewise.
+	* testsuite/tr2/direct_bases/value.cc: Likewise.
+	* testsuite/util/debug/checks.h: Likewise.
+	* testsuite/util/debug/unordered_checks.h: Likewise.
+	* testsuite/util/testsuite_allocator.h: Likewise.
+	* testsuite/util/testsuite_api.h: Likewise.
+	* testsuite/util/testsuite_common_types.h: Likewise.
+	* testsuite/util/testsuite_random.h: Likewise.
+	* testsuite/util/testsuite_rvalref.h: Likewise.
+
 2016-10-13  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/shared_ptr_base.h: Include <functional>.
diff --git a/libstdc++-v3/testsuite/24_iterators/container_access.cc b/libstdc++-v3/testsuite/24_iterators/container_access.cc
index f4d4f7e..262a62c 100644
--- a/libstdc++-v3/testsuite/24_iterators/container_access.cc
+++ b/libstdc++-v3/testsuite/24_iterators/container_access.cc
@@ -24,8 +24,6 @@
 #include <vector>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void
 test01()
 {
diff --git a/libstdc++-v3/testsuite/24_iterators/istream_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/istream_iterator/2.cc
index ba48769..d0b435b 100644
--- a/libstdc++-v3/testsuite/24_iterators/istream_iterator/2.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istream_iterator/2.cc
@@ -26,7 +26,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   string st("R.Rorty");
 
diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2.cc
index 83ed656..b8cc4f1 100644
--- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2.cc
@@ -23,12 +23,11 @@
 #include <iterator>
 #include <testsuite_hooks.h>
 
-bool test02(void)
+void test02(void)
 {
 
   typedef std::istreambuf_iterator<char> cistreambuf_iter;
   typedef cistreambuf_iter::streambuf_type cstreambuf_type;
-  bool test __attribute__((unused)) = true;
   const char slit01[] = "playa hermosa, liberia, guanacaste";
   std::string str01(slit01);
   std::istringstream istrs00(str01);
@@ -106,7 +105,6 @@ bool test02(void)
       c = *++istrb_it28;
       VERIFY( c == slit01[++i] );
     }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2627.cc b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2627.cc
index c888c6d..c2c5c8d 100644
--- a/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2627.cc
+++ b/libstdc++-v3/testsuite/24_iterators/istreambuf_iterator/2627.cc
@@ -26,7 +26,6 @@
 // libstdc++/2627
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("free the vieques");
 
   // 1
diff --git a/libstdc++-v3/testsuite/24_iterators/operations/next.cc b/libstdc++-v3/testsuite/24_iterators/operations/next.cc
index 8e48eda..13bb70b 100644
--- a/libstdc++-v3/testsuite/24_iterators/operations/next.cc
+++ b/libstdc++-v3/testsuite/24_iterators/operations/next.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::vector<int> c(3);
   std::vector<int>::iterator i = c.begin(), j;
 
@@ -37,7 +36,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::list<int> c(3);    
   std::list<int>::iterator i = c.begin(), j;
 
diff --git a/libstdc++-v3/testsuite/24_iterators/operations/prev.cc b/libstdc++-v3/testsuite/24_iterators/operations/prev.cc
index afffe17..4f3e5c4 100644
--- a/libstdc++-v3/testsuite/24_iterators/operations/prev.cc
+++ b/libstdc++-v3/testsuite/24_iterators/operations/prev.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::vector<int> c(3);    
   std::vector<int>::iterator i = c.end(), j;
 
@@ -37,7 +36,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::list<int> c(3);    
   std::list<int>::iterator i = c.end(), j;
 
diff --git a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc
index d01684e..140374f 100644
--- a/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc
+++ b/libstdc++-v3/testsuite/24_iterators/ostreambuf_iterator/2.cc
@@ -23,11 +23,10 @@
 #include <iterator>
 #include <testsuite_hooks.h>
 
-bool test02(void)
+void test02(void)
 {
   typedef std::ostreambuf_iterator<char> costreambuf_iter;
   typedef costreambuf_iter::streambuf_type cstreambuf_type;
-  bool test __attribute__((unused)) = true;
   const char slit01[] = "playa hermosa, liberia, guanacaste";
   const char slit02[] = "bodega bay, lost coast, california";
   std::string str01(slit01);
@@ -81,7 +80,6 @@ bool test02(void)
   tmp = ostrs00.str();
   VERIFY ( tmp != str01 );
   VERIFY ( tmp != str02 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/24_iterators/random_access_iterator/26020.cc b/libstdc++-v3/testsuite/24_iterators/random_access_iterator/26020.cc
index b1a6447..79e0888 100644
--- a/libstdc++-v3/testsuite/24_iterators/random_access_iterator/26020.cc
+++ b/libstdc++-v3/testsuite/24_iterators/random_access_iterator/26020.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;  
 
   list<int> ll;
   ll.push_back(1);
diff --git a/libstdc++-v3/testsuite/24_iterators/range_access_cpp14.cc b/libstdc++-v3/testsuite/24_iterators/range_access_cpp14.cc
index eca3d43..1c80e9b 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_access_cpp14.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_access_cpp14.cc
@@ -23,8 +23,6 @@
 #include <vector>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void
 test01()
 {
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/11729.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/11729.cc
index 1c0e55e..fe7d690 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/11729.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/11729.cc
@@ -25,8 +25,6 @@
 // libstdc++/11729
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<int> Vec;
   typedef Vec::reverse_iterator reverse_iterator;
   typedef Vec::const_reverse_iterator const_reverse_iterator;
diff --git a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc
index 9027a93..504e132 100644
--- a/libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc
+++ b/libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc
@@ -26,8 +26,6 @@
 // libstdc++/10783
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<int> V;
   VERIFY( sizeof(V::iterator) == sizeof(V::reverse_iterator) );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/adjacent_find/vectorbool.cc b/libstdc++-v3/testsuite/25_algorithms/adjacent_find/vectorbool.cc
index c6e1a77..30390df 100644
--- a/libstdc++-v3/testsuite/25_algorithms/adjacent_find/vectorbool.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/adjacent_find/vectorbool.cc
@@ -24,8 +24,6 @@
 void 
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> v;
   v.push_back(true);
   v.push_back(false);
diff --git a/libstdc++-v3/testsuite/25_algorithms/all_of/1.cc b/libstdc++-v3/testsuite/25_algorithms/all_of/1.cc
index ae95502..a5f24fb 100644
--- a/libstdc++-v3/testsuite/25_algorithms/all_of/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/all_of/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( std::all_of(con.begin(), con.end(), predicate) );
 }
@@ -45,8 +43,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( std::all_of(con.begin(), con.end(), predicate) );
 }
@@ -54,8 +50,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
   VERIFY( !std::all_of(con.begin(), con.end(), predicate) );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/any_of/1.cc b/libstdc++-v3/testsuite/25_algorithms/any_of/1.cc
index 97ca9bc..57f0881 100644
--- a/libstdc++-v3/testsuite/25_algorithms/any_of/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/any_of/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( !std::any_of(con.begin(), con.end(), predicate) );
 }
@@ -45,8 +43,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( !std::any_of(con.begin(), con.end(), predicate) );
 }
@@ -54,8 +50,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
   VERIFY( std::any_of(con.begin(), con.end(), predicate) );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search/2.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search/2.cc
index 9cf7ceb..42184f4 100644
--- a/libstdc++-v3/testsuite/25_algorithms/binary_search/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/binary_search/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 3, 3, 5, 8};
 const int C[] = {8, 5, 3, 3, 3, 2, 1};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc
index dbed055..019b20c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc
@@ -39,8 +39,6 @@ struct X
 void
 test01()
 {
-  bool test __attribute((unused)) = true;
-
   // Test with range that is partitioned, but not sorted.
   X seq[] = { 1, 3, 5, 7, 1, 6, 4 };
   test_container<X, forward_iterator_wrapper> c(seq);
diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc
index cf2e131..183c367 100644
--- a/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/clamp/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int x = std::clamp(1, 2, 4);
   const int y = std::clamp(3, 2, 4);
   const int z = std::clamp(5, 2, 4);
diff --git a/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc b/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc
index 50c1a51..1074495 100644
--- a/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/clamp/2.cc
@@ -29,8 +29,6 @@ const T A<T>::a = T(3);
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( 3 == std::clamp(A<int>::a, 2, 4) );
   VERIFY( 2 == std::clamp(A<int>::a, 1, 2) );
   VERIFY( 4 == std::clamp(A<int>::a, 4, 6) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
index aed4a21..bf439a1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
@@ -25,7 +25,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
index e8e7ee0..363d51f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
@@ -25,7 +25,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
index 7d05b4e..2d9dfc0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
@@ -26,7 +26,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc b/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc
index f33235d..ad7452b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc
@@ -38,8 +38,6 @@ public:
 // libstdc++/34595
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   int t[10] = {0,};
   Counting_output_iterator cnt;
   std::size_t res = std::copy(t+0, t+5, cnt).current_counter();
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
index 10c0b45..427d0b0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
@@ -26,7 +26,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc
index 172c2ae..40fe396 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc
@@ -21,7 +21,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   deque<long> data(200);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc
index f8b3096..198dba6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc
@@ -36,8 +36,6 @@ typedef test_container<rvalstruct, output_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/25_algorithms/copy/streambuf_iterators/char/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc
index 6868146..736b92e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<char> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc
index 1e62420..6f68363 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc
@@ -26,7 +26,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<char> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc
index d4bec75..1c93283 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef ostreambuf_iterator<char> out_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc
index f75fc9b..cd0353e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc
@@ -28,7 +28,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<char> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc
index 919856c..c91411e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<wchar_t> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc
index 5080ecf..ed148a1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<wchar_t> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc
index 8266831..438193c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef ostreambuf_iterator<wchar_t> out_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc
index 7d033c6..2b4f49a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   
   typedef istreambuf_iterator<wchar_t> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc
index 211de81..cab0c78 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc
@@ -21,7 +21,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   deque<long> data(200);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc
index b87269f..adf08cf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc
@@ -37,8 +37,6 @@ typedef test_container<rvalstruct,
 
 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/25_algorithms/copy_n/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc
index bd613d5..e073366 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc
@@ -27,7 +27,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc
index 9a7250d..3fd0972 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc
@@ -27,7 +27,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc
index d205888..f019b2c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc
@@ -28,7 +28,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc
index ee08ed2..34626ed 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc
@@ -28,7 +28,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/50119.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/50119.cc
index 07148e6..cd7bbb9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/50119.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/50119.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   vector<int> v;
   istringstream s("1 2 3 4 5");
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc
index 8ac42cc..b924604 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc
@@ -38,8 +38,6 @@ typedef test_container<rvalstruct, output_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/25_algorithms/equal_range/2.cc b/libstdc++-v3/testsuite/25_algorithms/equal_range/2.cc
index 82fbeef..d67e7d0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/equal_range/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/equal_range/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 3, 3, 5, 8};
 const int C[] = {8, 5, 3, 3, 3, 2, 1};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc
index 5c23a34..6bcfe55 100644
--- a/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc
@@ -39,8 +39,6 @@ struct X
 void
 test01()
 {
-  bool test __attribute((unused)) = true;
-
   // Test with range that is partitioned, but not sorted.
   X seq[] = { 1, 3, 5, 7, 1, 6, 4, 2 };
   test_container<X, forward_iterator_wrapper> c(seq);
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/1.cc b/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
index 71ebc4f..a829811 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
@@ -39,7 +39,6 @@ public:
 // fill
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const int val = 1;
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/2.cc b/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
index 03675d8..00851809 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
@@ -39,7 +39,6 @@ public:
 // fill_n
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const int val = 3;
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/3.cc b/libstdc++-v3/testsuite/25_algorithms/fill/3.cc
index e0bc409..ba5f20d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/3.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   char ca[1] = { '\0' };
   signed char sc = 1;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/4.cc b/libstdc++-v3/testsuite/25_algorithms/fill/4.cc
index 3abe305..c4abc97 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/4.cc
@@ -27,7 +27,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A1[] = {3, 3, 3, 3, 3, 3, 3, 3, 3, 3};
   const int N1 = sizeof(A1) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc
index 6d17381..d6ec9d3 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc
@@ -27,7 +27,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const int A1[] = {3, 3, 3, 3, 3, 3, 3, 3, 3, 3};
   const int N1 = sizeof(A1) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/find/39546.cc b/libstdc++-v3/testsuite/25_algorithms/find/39546.cc
index b6022e2..cffe2a3 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find/39546.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find/39546.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<std::string> dict;
   dict.push_back("one");
   dict.push_back("two");
diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc
index e426237..475161c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<char> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc
index 7dbb0dc..92ba8ad 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc
@@ -27,7 +27,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<char> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc
index a29d8b3..a1f6153 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<wchar_t> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc
index da3c82b..1ef5efe 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc
@@ -25,7 +25,6 @@
 // In the occasion of libstdc++/25482
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef istreambuf_iterator<wchar_t> in_iterator_type;
diff --git a/libstdc++-v3/testsuite/25_algorithms/find_if/1.cc b/libstdc++-v3/testsuite/25_algorithms/find_if/1.cc
index c0a36bc..18fc7e5 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find_if/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find_if/1.cc
@@ -34,8 +34,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( std::find_if(con.begin(), con.end(), 
 		       predicate).ptr == array );
@@ -44,8 +42,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( std::find_if(con.begin(), con.end(), 
 		       predicate).ptr == array + 1 );
@@ -54,8 +50,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
   VERIFY( std::find_if(con.begin(), con.end(),
 		       predicate).ptr == array + 3 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/find_if_not/1.cc b/libstdc++-v3/testsuite/25_algorithms/find_if_not/1.cc
index 2f38bb5..9055513 100644
--- a/libstdc++-v3/testsuite/25_algorithms/find_if_not/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/find_if_not/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( std::find_if_not(con.begin(), con.end(), 
 			   predicate).ptr == array );
@@ -46,8 +44,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( std::find_if_not(con.begin(), con.end(), 
 			   predicate).ptr == array + 1 );
@@ -56,8 +52,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
   VERIFY( std::find_if_not(con.begin(), con.end(),
 			   predicate).ptr == array + 3 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc b/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc
index 7d65ed1..6a01715 100644
--- a/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc
@@ -45,7 +45,6 @@ private:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::test_container;
   using __gnu_test::input_iterator_wrapper;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/1.cc b/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
index f17af80..26c4822 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/1.cc
@@ -53,8 +53,6 @@ int Gt::_M_count = 0;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // sort array s1 using push_heap/pop_heap
   int s1[N];
   std::copy(A, A + N, s1);
@@ -83,8 +81,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   Gt gt;
 
 #ifndef _GLIBCXX_DEBUG
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
index 1a4c464..82e6938 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
@@ -41,8 +41,6 @@ typedef test_container<int, random_access_iterator_wrapper> container_ref;
 void 
 check_make(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct makeheap[9];
   int        makeheap_ref[9];
   std::copy(array, array + length, makeheap);
@@ -61,8 +59,6 @@ check_make(int* array, int length)
 void
 check_pop(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct popheap[9];
   int        popheap_ref[9];
   std::copy(array, array + length, popheap);
@@ -81,8 +77,6 @@ check_pop(int* array, int length)
 void
 check_sort(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct sortheap[9];
   int        sortheap_ref[9];
   std::copy(array, array + length, sortheap);
@@ -101,8 +95,6 @@ check_sort(int* array, int length)
 void
 check_push(int* array, int pushval, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct pushheap[10];
   int        pushheap_ref[10];
   std::copy(array, array + length, pushheap);
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
index 8728baf..01e33a8 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc
@@ -47,8 +47,6 @@ bool are_ordered_int(const int& lhs, const int& rhs)
 void 
 check_make(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct makeheap[9];
   int        makeheap_ref[9];
   std::copy(array, array + length, makeheap);
@@ -67,8 +65,6 @@ check_make(int* array, int length)
 void
 check_pop(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct popheap[9];
   int        popheap_ref[9];
   std::copy(array, array + length, popheap);
@@ -87,8 +83,6 @@ check_pop(int* array, int length)
 void
 check_sort(int* array, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct sortheap[9];
   int        sortheap_ref[9];
   std::copy(array, array + length, sortheap);
@@ -107,8 +101,6 @@ check_sort(int* array, int length)
 void
 check_push(int* array, int pushval, int length)
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct pushheap[10];
   int        pushheap_ref[10];
   std::copy(array, array + length, pushheap);
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/vectorbool.cc b/libstdc++-v3/testsuite/25_algorithms/heap/vectorbool.cc
index f26e850..3364b0d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/vectorbool.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/vectorbool.cc
@@ -55,8 +55,6 @@ int Gt::_S_count = 0;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // sort array s1 using push_heap/pop_heap
   std::vector<bool> s1;
   std::copy(A, A + N, std::back_inserter(s1));
@@ -85,8 +83,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   Gt gt;
 
 #ifndef _GLIBCXX_DEBUG
diff --git a/libstdc++-v3/testsuite/25_algorithms/includes/1.cc b/libstdc++-v3/testsuite/25_algorithms/includes/1.cc
index aaedb55..5057c3a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/includes/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/includes/1.cc
@@ -30,7 +30,6 @@ typedef test_container<int, input_iterator_wrapper> Container;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {0};
   Container con1(array, array);
   Container con2(array, array);
@@ -40,7 +39,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {0, 1};
   Container con1(array, array);
   Container con2(array, array + 2);
@@ -50,7 +48,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {0, 1};
   Container con1(array, array + 2);
   Container con2(array, array);
@@ -60,7 +57,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
   int array1[] = {1, 2, 3, 4, 6, 8, 9};
   int array2[] = {2, 4, 6, 8};
   Container con1(array1, array1 + 7);
@@ -71,7 +67,6 @@ test4()
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
   int array1[] = {1, 2, 3, 5};
   int array2[] = {2, 4, 6, 8};
   Container con1(array1, array1 + 4);
diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/1.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/1.cc
index 753a7be..bcaa472 100644
--- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/1.cc
@@ -42,8 +42,6 @@ test1()
 void 
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = { 0, 2, 4, 1, 3, 5 };
   container con(array, array + 6);
   inplace_merge(con.begin(), con.it(3), con.end());
@@ -65,8 +63,6 @@ struct S
 void 
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   S s[8];
   s[0].a = 0;
   s[1].a = 1;
diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/49559.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/49559.cc
index 4803b7f..958a7e1 100644
--- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/49559.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/49559.cc
@@ -43,8 +43,6 @@ bool are_ordered(const rvalstruct& lhs, const rvalstruct& rhs)
 // libstdc++/49559
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[6];
   std::copy(A, A + N, s1);
   Container con1(s1, s1 + N);
diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
index 9560afd..c5ca701 100644
--- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable.cc
@@ -33,8 +33,6 @@ typedef test_container<rvalstruct, bidirectional_iterator_wrapper> container;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int array1[]={0,2,4,1,3,5};
   rvalstruct rv_array1[6];
   std::copy(array1, array1 + 6, rv_array1);
diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable2.cc
index 504f8b1..0d82533 100644
--- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/moveable2.cc
@@ -37,8 +37,6 @@ are_ordered(const rvalstruct& lhs, const rvalstruct& rhs)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int array1[]={0,2,4,1,3,5};
   rvalstruct rv_array1[6];
   std::copy(array1, array1 + 6, rv_array1);
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc
index f46495a..89a6333 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc
@@ -32,8 +32,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (int i = 0; i <= N; ++i)
     {
       VERIFY( std::is_heap(A, A + i) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc
index b2f2074..7a8ba29 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc
@@ -32,8 +32,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (int i = 0; i <= N; ++i)
     {
       VERIFY( A + i == std::is_heap_until(A, A + i) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_partitioned/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_partitioned/1.cc
index 4b1a1b7..bd7bfcc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_partitioned/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_partitioned/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( std::is_partitioned(con.begin(), con.end(), predicate) );
 }
@@ -45,8 +43,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( std::is_partitioned(con.begin(), con.end(), predicate) );
 }
@@ -54,8 +50,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 8);
   VERIFY( !std::is_partitioned(con.begin(), con.end(), predicate) );
 }
@@ -63,8 +57,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array + 2, array + 7);
   VERIFY( std::is_partitioned(con.begin(), con.end(), predicate) );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_permutation/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_permutation/1.cc
index 3fb98d6..8a030be 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_permutation/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_permutation/1.cc
@@ -37,8 +37,6 @@ const int arr0[] = { 11, 22, 33, 44, 55 };
 void
 do_test(int arr1[5], bool np = true)
 {
-  bool test __attribute__((unused)) = true;
-
   do
     VERIFY( std::is_permutation(arr1, arr1 + 5, arr0) == np );
   while (std::next_permutation(arr1, arr1 + 5));
@@ -48,8 +46,6 @@ template<typename Predicate>
   void
   do_test(int arr1[5], Predicate pred, bool np = true)
   {
-    bool test __attribute__((unused)) = true;
-
     do
       VERIFY( std::is_permutation(arr1, arr1 + 5, arr0, pred) == np );
     while (std::next_permutation(arr1, arr1 + 5));
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_permutation/2.cc b/libstdc++-v3/testsuite/25_algorithms/is_permutation/2.cc
index 1761bec..864ca24 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_permutation/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_permutation/2.cc
@@ -35,8 +35,6 @@ const int arr0[] = { 11, 22, 33, 44, 55 };
 void
 do_test(int arr1[5], bool np = true, unsigned N = 5)
 {
-  bool test __attribute__((unused)) = true;
-
   do
     VERIFY( std::is_permutation(arr1, arr1 + 5, arr0, arr0 + N) == np );
   while (std::next_permutation(arr1, arr1 + 5));
@@ -46,8 +44,6 @@ template<typename Predicate>
   void
   do_test(int arr1[5], Predicate pred, bool np = true, unsigned N = 5)
   {
-    bool test __attribute__((unused)) = true;
-
     do
       VERIFY( std::is_permutation(arr1, arr1 + 5, arr0, arr0 + N, pred) == np );
     while (std::next_permutation(arr1, arr1 + 5));
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_permutation/vectorbool.cc b/libstdc++-v3/testsuite/25_algorithms/is_permutation/vectorbool.cc
index bb92cf6..87f09af 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_permutation/vectorbool.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_permutation/vectorbool.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> v1 = { true, false, true, false, true };
   std::vector<bool> v2 = { false, true, false, true, true };
   VERIFY( std::is_permutation(v1.begin(), v1.end(), v2.begin()) );
@@ -35,8 +33,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> v1 = { true, false, true, false, true };
   std::vector<bool> v2 = { false, true, false, true, true };
   VERIFY( std::is_permutation(v1.begin(), v1.end(), v2.begin(), v2.end()) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc
index 51166b3..57183c7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc
@@ -32,8 +32,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (int i = 0; i <= N; ++i)
     {
       VERIFY( std::is_sorted(A, A + i) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc b/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc
index 2befae6..4c0c0cf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc
@@ -32,8 +32,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (int i = 0; i <= N; ++i)
     {
       VERIFY( A + i == std::is_sorted_until(A, A + i) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/iter_swap/20577.cc b/libstdc++-v3/testsuite/25_algorithms/iter_swap/20577.cc
index 207a7ce..02decbf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/iter_swap/20577.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/iter_swap/20577.cc
@@ -22,8 +22,6 @@
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> v;
   v.push_back(true);
   v.push_back(false);
@@ -34,8 +32,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v;
   v.push_back(1);
   v.push_back(2);
@@ -52,8 +48,6 @@ void swap(X&, X&)
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   int_swap_count = 0;
   X i, j;
   std::iter_swap(&i, &j);
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/2.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/2.cc
index a119357..d545a8e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 3, 3, 5, 8};
 const int C[] = {8, 5, 3, 3, 3, 2, 1};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc
index 8d8bb72..e2cb3d2 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc
@@ -39,8 +39,6 @@ struct X
 void
 test01()
 {
-  bool test __attribute((unused)) = true;
-
   // Test with range that is partitioned, but not sorted.
   X seq[] = { 1, 3, 5, 7, 1, 6, 4, 2 };
   test_container<X, forward_iterator_wrapper> c(seq);
@@ -71,8 +69,6 @@ struct Y
 void
 test02()
 {
-  bool test __attribute((unused)) = true;
-
   // Test that Debug Mode checks don't fire (libstdc++/71545)
 
   Y seq[] = { -0.1, 1.2, 5.0, 5.2, 5.1, 5.9, 5.5, 6.0 };
diff --git a/libstdc++-v3/testsuite/25_algorithms/make_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/make_heap/complexity.cc
index 2907105..d555288 100644
--- a/libstdc++-v3/testsuite/25_algorithms/make_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/make_heap/complexity.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::counter_type;
   const std::size_t nb_values = 1000;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/max/1.cc b/libstdc++-v3/testsuite/25_algorithms/max/1.cc
index 915a46e..265d976 100644
--- a/libstdc++-v3/testsuite/25_algorithms/max/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/max/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int x = std::max(1, 2);
   const int y = std::max(4, 3);
   VERIFY( x == 2 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/max/2.cc b/libstdc++-v3/testsuite/25_algorithms/max/2.cc
index 58cd5b7..bf965d5 100644
--- a/libstdc++-v3/testsuite/25_algorithms/max/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/max/2.cc
@@ -29,8 +29,6 @@ const T A<T>::a = T(3);
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( 3 == std::max(A<int>::a, 2) );
   VERIFY( 4 == std::max(A<int>::a, 4) );
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/max/3.cc b/libstdc++-v3/testsuite/25_algorithms/max/3.cc
index 0e9bc58..542115c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/max/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/max/3.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int& x = std::max({1, 3, 2});
   const int& y = std::max({4, 3, 2});
   const int& z = std::max({3, 2, 4});
diff --git a/libstdc++-v3/testsuite/25_algorithms/max/37547.cc b/libstdc++-v3/testsuite/25_algorithms/max/37547.cc
index e54ac59..fe908dc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/max/37547.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/max/37547.cc
@@ -24,8 +24,6 @@
 // libstdc++/37547
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v{1,2,3,4,5};
 
   auto p = std::max({v});
diff --git a/libstdc++-v3/testsuite/25_algorithms/max/4.cc b/libstdc++-v3/testsuite/25_algorithms/max/4.cc
index 204ee06..1123a24 100644
--- a/libstdc++-v3/testsuite/25_algorithms/max/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/max/4.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int& z = std::max({1, 2, 3, 4, 5, 6, 7});
   const double& w = std::max({2.0, 1.0, 3.2, 4.5, 5.0, 6.0, 7.0});
   const int& y = std::max({2, 3, 1, 4, 5, 6, 7});
diff --git a/libstdc++-v3/testsuite/25_algorithms/min/1.cc b/libstdc++-v3/testsuite/25_algorithms/min/1.cc
index 5056e95..d237c45 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min/1.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int z = std::min(1, 2);
   const int w = std::min(4, 3);
   VERIFY( z == 1 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/min/2.cc b/libstdc++-v3/testsuite/25_algorithms/min/2.cc
index d0da139..48885aa 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min/2.cc
@@ -29,8 +29,6 @@ const T A<T>::a = T(3);
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( 2 == std::min(A<int>::a, 2) );
   VERIFY( 3 == std::min(A<int>::a, 4) );
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/min/3.cc b/libstdc++-v3/testsuite/25_algorithms/min/3.cc
index 627c5a1..bef823e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min/3.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int& z = std::min({1, 3, 2});
   const int& w = std::min({4, 3, 5});
   const int& y = std::min({4, 3, 2});
diff --git a/libstdc++-v3/testsuite/25_algorithms/min/37547.cc b/libstdc++-v3/testsuite/25_algorithms/min/37547.cc
index a9434ba..eb1b496 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min/37547.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min/37547.cc
@@ -24,8 +24,6 @@
 // libstdc++/37547
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v{1,2,3,4,5};
 
   auto p = std::min({v});
diff --git a/libstdc++-v3/testsuite/25_algorithms/min/4.cc b/libstdc++-v3/testsuite/25_algorithms/min/4.cc
index 0967489..7c694f8 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min/4.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const int& z = std::min({1, 2, 3, 4, 5, 6, 7});
   const double& w = std::min({2.0, 1.0, 3.2, 4.5, 5.0, 6.0, 7.0});
   const int& y = std::min({2, 3, 1, 4, 5, 6, 7});
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/1.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/1.cc
index 82aa3ab..e46126c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/minmax/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/minmax/1.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::pair<const int, const int> z = std::minmax(1, 2);
   std::pair<const int, const int> w = std::minmax(4, 3);
   VERIFY( z.first == 1 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc
index 523a60b..3c8310b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/minmax/2.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::pair<int, int> z = std::minmax({1, 2, 3});
   std::pair<int, int> w = std::minmax({4, 3, 5, 4});
   std::pair<int, int> y = std::minmax({4, 5, 3, 7, 3});
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc
index 3d03fba..0c4fd97 100644
--- a/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/minmax/3.cc
@@ -39,8 +39,6 @@ int compare_counter::count = 0;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::minmax({1, 2, 3, 4, 5, 6, 7, 8}, compare_counter());
 
   // If N is the number of arguments in the minmax function call, 
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax/37547.cc b/libstdc++-v3/testsuite/25_algorithms/minmax/37547.cc
index 506192c..3fae077 100644
--- a/libstdc++-v3/testsuite/25_algorithms/minmax/37547.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/minmax/37547.cc
@@ -24,8 +24,6 @@
 // libstdc++/37547
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v{1,2,3,4,5};
 
   auto p = std::minmax({v});
diff --git a/libstdc++-v3/testsuite/25_algorithms/minmax_element/1.cc b/libstdc++-v3/testsuite/25_algorithms/minmax_element/1.cc
index 437523d..bc2efd7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/minmax_element/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/minmax_element/1.cc
@@ -31,8 +31,6 @@ typedef std::pair<forward_iterator_wrapper<int>, forward_iterator_wrapper<int> >
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-  
   int array[] = {0};
   Container con(array, array);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -43,8 +41,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = {0};
   Container con(array, array + 1);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -55,8 +51,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-  
   int array[] = {0, 3};
   Container con(array, array + 2);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -67,8 +61,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
-  
   int array[] = {3, 0};
   Container con(array, array + 2);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -79,8 +71,6 @@ test4()
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = {3, 3};
   Container con(array, array + 2);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -91,8 +81,6 @@ test5()
 void
 test6()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = {6, 3, 0, 2, 6, 4, 0};
   Container con(array, array + 7);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -103,8 +91,6 @@ test6()
 void
 test7()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = {4, 4, 4, 6, 6, 6, 1, 1, 0, 0, 0, 2, 2};
   Container con(array, array + 13);
   pair_type p1 = minmax_element(con.begin(), con.end());
@@ -115,8 +101,6 @@ test7()
 void
 test8()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[] = {1, 7, 5, 5, 10, 1, 0, 0, 8, 4, 4, 0, 10, 10, 10, 1};
   Container con(array, array + 16);
   pair_type p1 = minmax_element(con.begin(), con.end());
diff --git a/libstdc++-v3/testsuite/25_algorithms/move/1.cc b/libstdc++-v3/testsuite/25_algorithms/move/1.cc
index bc0bc42..a0ee9b6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move/1.cc
@@ -35,8 +35,6 @@ typedef test_container<rvalstruct, output_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/25_algorithms/move/deque_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc
index 8cc4c9a..2acb70d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   deque<long> data(200);
diff --git a/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc
index 0fb79a8..b0ce1ed 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc
@@ -36,8 +36,6 @@ typedef test_container<rvalstruct,
 
 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/25_algorithms/move_backward/deque_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc
index ff4185e..1d74142 100644
--- a/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   deque<long> data(200);
diff --git a/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
index 178e74a..537fc40 100644
--- a/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/next_permutation/moveable.cc
@@ -34,8 +34,6 @@ typedef test_container<rvalstruct, bidirectional_iterator_wrapper> Container;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   // Note: The standard is unclear on what should happen in this case.
   // This seems the only really sensible behaviour, and what is done.
   rvalstruct array[] = {0};
@@ -46,8 +44,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct array[] = {0};
   Container con(array, array + 1);
   VERIFY( !next_permutation(con.begin(), con.end()) );
@@ -56,8 +52,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct array[] = {0, 3};
   Container con(array, array + 2);
   VERIFY( next_permutation(con.begin(), con.end()) );
@@ -69,8 +63,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[6] = {0, 1, 2, 3, 4, 5};
   for(int i = 0 ; i < 719; ++i)
     {
@@ -98,8 +90,6 @@ are_ordered(const rvalstruct& lhs, const rvalstruct& rhs)
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[6] = {0, 1, 2, 3, 4, 5};
   for(int i = 0 ; i < 719; ++i)
     {
diff --git a/libstdc++-v3/testsuite/25_algorithms/none_of/1.cc b/libstdc++-v3/testsuite/25_algorithms/none_of/1.cc
index db65153..5b654fc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/none_of/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/none_of/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
   VERIFY( std::none_of(con.begin(), con.end(), predicate) );
 }
@@ -45,8 +43,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-  
   Container con(array, array + 1);
   VERIFY( std::none_of(con.begin(), con.end(), predicate) );
 }
@@ -54,8 +50,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
   VERIFY( !std::none_of(con.begin(), con.end(), predicate) );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/1.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/1.cc
index 579a0b9..301b715 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/1.cc
@@ -48,7 +48,6 @@ test2()
 void 
 test3()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {6, 5, 4, 3, 2, 1, 0};
   Container con(array, array + 7);
   nth_element(con.begin(), con.it(3), con.end());
@@ -61,7 +60,6 @@ test3()
 void 
 test4()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {0, 6, 1, 5, 2, 4, 3};
   Container con(array,array + 7);
   nth_element(con.begin(), con.it(3), con.end());
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
index ad8859c..71bad00 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
@@ -44,8 +44,6 @@ test_set(std::vector<unsigned>& v, unsigned size)
 void
 do_test01(unsigned size)
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<unsigned> v, s;
 
   for (unsigned j = 0; j < size; ++j)
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/3.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/3.cc
index 657c564..4ac045b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/3.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
 const int C[] = {20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
index 134854c..5178a4c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/moveable.cc
@@ -40,8 +40,6 @@ typedef test_container<rvalstruct, random_access_iterator_wrapper> Container;
 void 
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {6, 5, 4, 3, 2, 1, 0};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
@@ -58,8 +56,6 @@ test1()
 void 
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {0, 6, 1, 5, 2, 4, 3};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
@@ -80,8 +76,6 @@ are_less(const rvalstruct& lhs, const rvalstruct& rhs)
 void 
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {0, 6, 1, 5, 2, 4, 3};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
index 0505656..e1e9500 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/random_test.cc
@@ -37,8 +37,6 @@ struct testNthElement
   template<typename Container, typename RandomGen>
   void operator()(Container con, RandomGen& rg)
   {
-    bool test __attribute__((unused)) = true;
-
     const int size = con.end() - con.begin();
     auto dist = std::uniform_int_distribution<>(0, size);
     const int element = dist(rg);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/2.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/2.cc
index 2fb2d26..02a082f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
 const int C[] = {20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/check_compare_by_value.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/check_compare_by_value.cc
index c4a3aba..0bbdb22 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/check_compare_by_value.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/check_compare_by_value.cc
@@ -39,8 +39,6 @@ typedef test_container<V, random_access_iterator_wrapper> Container;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -57,8 +55,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -75,8 +71,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   V vvs[] = { 2, 0 };
   std::partial_sort(vvs, vvs + 2, vvs + 2);
   VERIFY( vvs[0].ok && vvs[0].val == 0 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
index 77f9fed..5c4522e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/moveable.cc
@@ -40,8 +40,6 @@ typedef test_container<rvalstruct, random_access_iterator_wrapper> Container;
 void 
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {6, 5, 4, 3, 2, 1, 0};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
@@ -55,8 +53,6 @@ test1()
 void 
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {0, 6, 1, 5, 2, 4, 3};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
@@ -73,8 +69,6 @@ bool are_less(const rvalstruct& lhs, const rvalstruct& rhs)
 void 
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray[] = {0, 6, 1, 5, 2, 4, 3};
   rvalstruct array[7];
   std::copy(intarray, intarray + 7, array);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
index d93bd16..af8600f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/random_test.cc
@@ -37,8 +37,6 @@ struct testPartialSort
   template<typename Container, typename RandomGen>
   void operator()(Container con, RandomGen& rg)
   {
-    bool test __attribute__((unused)) = true;
-
     const int size = con.end() - con.begin();
     auto dist = std::uniform_int_distribution<>(0, size);
     const int element = dist(rg);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/2.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/2.cc
index 8437347..ddfc7ee 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
 const int C[] = {20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
index b336ec1..93b6fd4 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/random_test.cc
@@ -38,8 +38,6 @@ struct testPartialSortCopy
   template<typename Container, typename RandomGen>
   void operator()(Container con, RandomGen& rg)
   {
-    bool test __attribute__((unused)) = true;
-
     const int size = con.end() - con.begin();
     auto dist = std::uniform_int_distribution<>(0, size);
     const int element = dist(rg);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/1.cc b/libstdc++-v3/testsuite/25_algorithms/partition/1.cc
index 84b6e28..e703f2a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition/1.cc
@@ -21,8 +21,6 @@
 #include <functional>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
index ea63428..60b916a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc
@@ -35,8 +35,6 @@ using __gnu_test::rvalstruct;
 typedef test_container<rvalstruct, forward_iterator_wrapper> Fcontainer;
 typedef test_container<rvalstruct, bidirectional_iterator_wrapper> Bcontainer;
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_copy/1.cc b/libstdc++-v3/testsuite/25_algorithms/partition_copy/1.cc
index 6d993d1..1bbc340 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition_copy/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition_copy/1.cc
@@ -38,8 +38,6 @@ pred(int i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   int true_out[1] = { -1 };
   int false_out[1] = { -1 };
   Icontainer in_con(array, array);
@@ -57,8 +55,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   int true_out[1] = { -1 };
   int false_out[1] = { -1 };
   Icontainer in_con(array, array + 2);
@@ -78,8 +74,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   int true_out[3] = { -1, -1, -1 };
   int false_out[3] = { -1, -1, -1 };
   Icontainer in_con(array, array + 6);
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc b/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc
index 063ce48..2227a19 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc
@@ -36,8 +36,6 @@ predicate(const int& i)
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array);
 
   forward_iterator_wrapper<int> mid =
@@ -50,8 +48,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 1);
 
   forward_iterator_wrapper<int> mid =
@@ -64,8 +60,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   Container con(array, array + 6);
 
   forward_iterator_wrapper<int> mid =
diff --git a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
index d7e658a..b632fb3c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
@@ -29,8 +29,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::counter_type;
   const std::size_t nb_values = 1000;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
index 78cc277..d46c069 100644
--- a/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/prev_permutation/moveable.cc
@@ -34,8 +34,6 @@ typedef test_container<rvalstruct, bidirectional_iterator_wrapper> Container;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   // Note: The standard is unclear on what should happen in this case.
   // This seems the only really sensible behaviour, and what is done.
   rvalstruct array[] = {0};
@@ -46,8 +44,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct array[] = {0};
   Container con(array, array + 1);
   VERIFY( !prev_permutation(con.begin(), con.end()) );
@@ -56,8 +52,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct array[] = {3, 0};
   Container con(array, array + 2);
   VERIFY( prev_permutation(con.begin(), con.end()) );
@@ -69,8 +63,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[6] = {5, 4, 3, 2, 1, 0};
   for(int i = 0 ; i < 719; ++i)
     {
@@ -98,8 +90,6 @@ are_ordered(const rvalstruct& lhs, const rvalstruct& rhs)
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
-
   int array[6] = {5, 4, 3, 2, 1, 0};
   for(int i = 0 ; i < 719; ++i)
     {
diff --git a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
index 089512b..c80eac7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
@@ -29,8 +29,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::counter_type;
   const std::size_t nb_values = 1000;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
index ef17d2f..3e3ccc6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int N = 200000;
 int A[N], s1[N];
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
index cbe3e13..da89e1d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
@@ -46,8 +46,6 @@ void fill_ascending()
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   fill_ascending();
   rvalstruct rv[N];
   std::copy(A, A + N, rv);
@@ -68,8 +66,6 @@ int random_generator(int)
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct rv[10] = {1,2,3,4,5,6,7,8,9,10};
   int result[10] = {10,1,2,3,4,5,6,7,8,9};
   Container con(rv, rv + 10);
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/1.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/1.cc
index 43a4691..4c8e46b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate/1.cc
@@ -35,7 +35,6 @@ typedef test_container<int, random_access_iterator_wrapper> Rcontainer;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   int array[]={1};
   Fcontainer fcon(array, array);
   Bcontainer bcon(array, array);
@@ -48,7 +47,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {1};
   Fcontainer fcon(array, array + 1);
   Bcontainer bcon(array, array + 1);
@@ -64,7 +62,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {1, 2, 3, 4, 5};
   Fcontainer fcon(array, array + 5);
   Bcontainer bcon(array, array + 5);
@@ -83,7 +80,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {1, 2, 3, 4};
   Fcontainer fcon(array, array + 4);
   Bcontainer bcon(array, array + 4);  
@@ -106,7 +102,6 @@ test4()
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
   int array[] = {1, 2, 3, 4};
   Rcontainer con(array, array + 4);
   std::rotate(con.begin(), con.it(2), con.end());
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
index 5c05182..69e1239 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable.cc
@@ -41,7 +41,6 @@ typedef test_container<rvalstruct, random_access_iterator_wrapper> Rcontainer;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   int data[] = {1, 2, 3, 4, 5};
   rvalstruct array[5];
   std::copy(data, data + 5, array); 
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable2.cc
index 4d8349c..5aeaaba 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate/moveable2.cc
@@ -42,8 +42,6 @@ template<typename Con>
   void
   test_con(int length, int rotate_pos)
   {
-    bool test __attribute__((unused)) = true;
-
     /* Make sure the VLA upper bound is positive. */
     rvalstruct array[length + 1];
     for(int i = 0; i < length; ++i)
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate/rotate.cc b/libstdc++-v3/testsuite/25_algorithms/rotate/rotate.cc
index 219006d..383bf8e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate/rotate.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate/rotate.cc
@@ -21,8 +21,6 @@
 #include <testsuite_hooks.h>
 #include <list>
 
-bool test __attribute__((unused)) = true;
-
 int A[] = {1, 2, 3, 4, 5, 6, 7};
 int B[] = {2, 3, 4, 5, 6, 7, 1};
 int C[] = {1, 2, 3, 4, 5, 6, 7};
@@ -31,7 +29,7 @@ const int N = sizeof(A) / sizeof(int);
 
 /* need a test for a forward iterator -- can't think of one that makes sense */
 
-/* biderectional iterator */
+/* bidirectional iterator */
 void
 test02()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/search/1.cc b/libstdc++-v3/testsuite/25_algorithms/search/1.cc
index 4a6b9ea..5be2b7f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/search/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/search/1.cc
@@ -34,7 +34,6 @@ int array2[] = {0, 0, 0};
 void 
 test1()
 {
-  bool test __attribute__((unused)) = true;
   Container con1(array1, array1);
   Container con2(array1, array1 + 1);
   VERIFY(search(con1.begin(), con1.end(), con2.begin(), con2.end()).ptr == array1);
@@ -44,7 +43,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   Container con1(array1, array1 + 3);
   Container con2(array2, array2 + 3);
   VERIFY(search(con1.begin(), con1.end(), con2.begin(), con2.end()).ptr 
@@ -54,7 +52,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
   Container con1(array1 + 3, array1 + 10);
   Container con2(array2, array2 + 3);
   VERIFY(search(con1.begin(), con1.end(), con2.begin(), con2.end()).ptr 
@@ -64,7 +61,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
   Container con1(array1, array1 + 10);
   Container con2(array2, array2 + 1);
   VERIFY(search(con1.begin(), con1.end(), con2.begin(), con2.end()).ptr
@@ -74,7 +70,6 @@ test4()
 void
 test5()
 {
-  bool test __attribute__((unused)) = true;
   Container con1(array1 + 6, array1 + 10);
   Container con2(array2, array2 + 1);
   VERIFY(search(con1.begin(), con1.end(), con2.begin(), con2.end()).ptr
@@ -84,7 +79,6 @@ test5()
 void
 test6()
 {
-  bool test __attribute__((unused)) = true;
   int array3[]={2, 2, 1, 2, 3, 5};
   int array4[]={1, 2, 3, 4};
   Container con1(array3, array3 + 3);
diff --git a/libstdc++-v3/testsuite/25_algorithms/search_n/58358.cc b/libstdc++-v3/testsuite/25_algorithms/search_n/58358.cc
index a16002c..5962ac8 100644
--- a/libstdc++-v3/testsuite/25_algorithms/search_n/58358.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/search_n/58358.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> a{2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
   int count = 0;
   std::search_n(a.begin(), a.end(), 10, 1,
diff --git a/libstdc++-v3/testsuite/25_algorithms/shuffle/1.cc b/libstdc++-v3/testsuite/25_algorithms/shuffle/1.cc
index 7e717f8..d3b2332 100644
--- a/libstdc++-v3/testsuite/25_algorithms/shuffle/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/shuffle/1.cc
@@ -27,8 +27,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   for (unsigned size = 0; size < 50; ++size)
     {
       std::vector<int> vref(size);
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/1.cc b/libstdc++-v3/testsuite/25_algorithms/sort/1.cc
index 50c4bbb..cd399f0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/1.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
 const int C[] = {20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/check_compare_by_value.cc b/libstdc++-v3/testsuite/25_algorithms/sort/check_compare_by_value.cc
index 3696d2a..5e5641f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/check_compare_by_value.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/check_compare_by_value.cc
@@ -39,8 +39,6 @@ typedef test_container<V, random_access_iterator_wrapper> Container;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -54,8 +52,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -68,8 +64,6 @@ test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   V vvs[] = { 2, 0 };
   std::sort(vvs, vvs + 2);
   VERIFY( vvs[0].ok && vvs[0].val == 0 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
index 1b1f9e9..4d100b8 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/moveable.cc
@@ -45,8 +45,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N];
   std::copy(A, A + N, s1);
   Container con(s1, s1 + N);
@@ -63,8 +61,6 @@ bool order(const rvalstruct& lhs, const rvalstruct& rhs)
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N];
   std::copy(A, A + N, s1);
   Container con(s1, s1 + N);
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc b/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
index 5c4c768..dbf5c52 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/random_test.cc
@@ -37,8 +37,6 @@ struct testSort
   template<typename Container, typename RandomGen>
   void operator()(Container con, RandomGen&)
   {
-    bool test __attribute__((unused)) = true;
-
     std::sort(con.begin(), con.end());
     VERIFY( std::is_sorted(con.begin(), con.end()) );
   }
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/vectorbool.cc b/libstdc++-v3/testsuite/25_algorithms/sort/vectorbool.cc
index 7185ee9..45cda37 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort/vectorbool.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort/vectorbool.cc
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> b;
   b.push_back(false);
   b.push_back(true);
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc b/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc
index c6f5fe8..80aec6e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort_heap/check_compare_by_value.cc
@@ -33,8 +33,6 @@ typedef test_container<V, random_access_iterator_wrapper> Container;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -49,8 +47,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -65,8 +61,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   V vvs[] = { 2, 0 };
   std::make_heap(vvs, vvs + 2);
   std::sort_heap(vvs, vvs + 2);
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
index cfcaae9..a9f11f9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::counter_type;
   const std::size_t nb_values = 1000;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc
index 4c6c3fb..8f80d27 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc
@@ -22,8 +22,6 @@
 #include <testsuite_new_operators.h>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/mem_check.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/mem_check.cc
index ff212a8..280efa5 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_partition/mem_check.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_partition/mem_check.cc
@@ -39,8 +39,6 @@ bool even(const copy_tracker& ct)
 void
 test1(int throw_count)
 {
-  bool test __attribute__((unused)) = true;
-
   copy_tracker vals[30];
   for(int i = 0; i < 30; ++i)
     vals[i] = A[i];
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
index cc96da4..24b7a4b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc
@@ -51,8 +51,6 @@ struct Pred
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N];
   std::copy(A, A + N, s1);
   Container con(s1, s1 + N);
@@ -65,8 +63,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N2];
   std::copy(A2, A2 + N2, s1);
   Container con(s1, s1 + N2);
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/2.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/2.cc
index 1b7a2ef..f116646 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
 const int C[] = {20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/3.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/3.cc
index 61a5b6d..db2409e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/3.cc
@@ -24,8 +24,6 @@
 void 
 test1()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> bools;
   bools.push_back(true);
   bools.push_back(false);
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/49559.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/49559.cc
index f55a9d0..50e6db7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/49559.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/49559.cc
@@ -43,8 +43,6 @@ bool order(const rvalstruct& lhs, const rvalstruct& rhs)
 // libstdc++/49559
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[1];
   std::copy(A, A + 1, s1);
   Container con1(s1, s1 + 1);
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/check_compare_by_value.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/check_compare_by_value.cc
index d60bb15..6c99ecd 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/check_compare_by_value.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/check_compare_by_value.cc
@@ -39,8 +39,6 @@ typedef test_container<V, random_access_iterator_wrapper> Container;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -57,8 +55,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   V s1[] = { 10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 
 	     17, 8, 18, 9, 19 };
   const int N = sizeof(s1) / sizeof(V);
@@ -72,8 +68,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   V vvs[] = { 2, 0 };
   std::stable_sort(vvs, vvs + 2);
   VERIFY( vvs[0].ok && vvs[0].val == 0 );
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/mem_check.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/mem_check.cc
index d5aee3e..79cccae 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/mem_check.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/mem_check.cc
@@ -36,8 +36,6 @@ const int A[] = {10, 20, 1, 11, 2, 21, 28, 29, 12, 35, 15, 27, 6, 16, 7,
 void
 test_mem1(int throw_count)
 {
-  bool test __attribute__((unused)) = true;
-
   copy_tracker vals[30];
   for(int i = 0; i < 30; ++i)
     vals[i] = A[i];
@@ -67,8 +65,6 @@ is_ordered(const copy_tracker& lhs, const copy_tracker& rhs)
 void
 test_mem2(int throw_count)
 {
-  bool test __attribute__((unused)) = true;
-
   copy_tracker vals[30];
   for(int i = 0; i < 30; ++i)
     vals[i] = A[i];
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
index f8938d3..dcc1941 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable.cc
@@ -44,8 +44,6 @@ const int N = sizeof(A) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N];
   std::copy(A, A + N, s1);
   Container con(s1, s1 + N);
diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
index 5d18bbe..9d82f1a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/moveable2.cc
@@ -47,8 +47,6 @@ bool order(const rvalstruct& lhs, const rvalstruct& rhs)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   rvalstruct s1[N];
   std::copy(A, A + N, s1);
   Container con(s1, s1 + N);
diff --git a/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc
index 112bea9..3841808 100644
--- a/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/swap_ranges/1.cc
@@ -30,7 +30,6 @@ typedef test_container<int, forward_iterator_wrapper> Container;
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   int array1[]={1, 2};
   int array2[]={3, 4};
   Container con1(array1, array1 + 2);
@@ -43,7 +42,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   int array1[] = {1};
   int array2[] = {1};
   Container con1(array1, array1);
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc b/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc
index 2d10608..8f5ed8e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc
@@ -31,8 +31,6 @@ bool compare(int a, int b)
 // libstdc++/11480
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unique(a, a+10, compare);
   VERIFY( compare_count == 9 );
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/2.cc b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
index 72e7e13..1870a50 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
@@ -38,7 +38,6 @@ const int B3[] = {9, 9, 8, 8, 8, 8, 7, 6, 6, 1, 1, 1, 1, 1};
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   list<int>::iterator pos;
@@ -54,7 +53,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   list<int>::iterator pos;
@@ -70,7 +68,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   list<int>::iterator pos;
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
index 7d19432..7a2d86e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/moveable.cc
@@ -36,8 +36,6 @@ typedef test_container<rvalstruct, forward_iterator_wrapper> Container;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray1[] = {1, 4, 4, 6, 1, 2, 2, 3, 1, 6, 6, 6, 5, 7, 5, 4, 4};
   int intarray2[] = {1, 1, 1, 2, 2, 1, 1, 7, 6, 6, 7, 8, 8, 8, 8, 9, 9};
 
@@ -69,8 +67,6 @@ bool are_equal(const rvalstruct& rhs, const rvalstruct& lhs)
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   int intarray1[] = {1, 4, 4, 6, 1, 2, 2, 3, 1, 6, 6, 6, 5, 7, 5, 4, 4};
   int intarray2[] = {1, 1, 1, 2, 2, 1, 1, 7, 6, 6, 7, 8, 8, 8, 8, 9, 9};
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique_copy/1.cc b/libstdc++-v3/testsuite/25_algorithms/unique_copy/1.cc
index b6062be..b74672b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique_copy/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique_copy/1.cc
@@ -37,7 +37,6 @@ int array2[2];
 void 
 test1()
 {
-  bool test __attribute__((unused)) = true;
   Icontainer con1(array1, array1);
   Ocontainer con2(array2, array2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr == array2 );
@@ -46,7 +45,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   Icontainer con1(array1, array1 + 6);
   Ocontainer con2(array2, array2 + 2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr 
@@ -57,7 +55,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
   Icontainer con1(array1, array1);
   Fcontainer con2(array2, array2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr == array2 );
@@ -66,7 +63,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
   Icontainer con1(array1, array1 + 6);
   Fcontainer con2(array2, array2 + 2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique_copy/2.cc b/libstdc++-v3/testsuite/25_algorithms/unique_copy/2.cc
index 1a83369..6b336a2 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique_copy/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique_copy/2.cc
@@ -37,7 +37,6 @@ int array2[2];
 void
 test1()
 {
-  bool test __attribute__((unused)) = true;
   Fcontainer con1(array1, array1);
   Ocontainer con2(array2, array2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr == array2 );
@@ -46,7 +45,6 @@ test1()
 void
 test2()
 {
-  bool test __attribute__((unused)) = true;
   Fcontainer con1(array1, array1 + 6);
   Ocontainer con2(array2, array2 + 2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin()).ptr
@@ -57,7 +55,6 @@ test2()
 void
 test3()
 {
-  bool test __attribute__((unused)) = true;
   Fcontainer con1(array1, array1);
   Ocontainer con2(array2, array2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin(),
@@ -67,7 +64,6 @@ test3()
 void
 test4()
 {
-  bool test __attribute__((unused)) = true;
   Fcontainer con1(array1, array1 + 6);
   Ocontainer con2(array2, array2 + 2);
   VERIFY( unique_copy(con1.begin(), con1.end(), con2.begin(),
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique_copy/26133.cc b/libstdc++-v3/testsuite/25_algorithms/unique_copy/26133.cc
index 1bea260..a6c21da 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique_copy/26133.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique_copy/26133.cc
@@ -30,7 +30,6 @@ struct no_assign
 // libstdc++/26133
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::ostringstream oss1, oss2;
 
   no_assign in[4];
diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/2.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/2.cc
index f51c5b5..7507413 100644
--- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/2.cc
@@ -20,8 +20,6 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 const int A[] = {1, 2, 3, 3, 3, 5, 8};
 const int C[] = {8, 5, 3, 3, 3, 2, 1};
 const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc
index 705a3f4..868663b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc
@@ -39,8 +39,6 @@ struct X
 void
 test01()
 {
-  bool test __attribute((unused)) = true;
-
   // Test with range that is partitioned, but not sorted.
   X seq[] = { 1, 3, 5, 7, 1, 6, 4, 2 };
   test_container<X, forward_iterator_wrapper> c(seq);
@@ -69,8 +67,6 @@ struct Y
 void
 test02()
 {
-  bool test __attribute((unused)) = true;
-
   // Test that Debug Mode checks don't fire (libstdc++/71545)
 
   Y seq[] = { -0.1, 1.2, 5.0, 5.2, 5.1, 5.9, 5.5, 6.0 };
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
index d2cd983..08798ba 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   regex("\\[", regex_constants::awk);
   VERIFY(regex_match_debug("\"", regex("[\\\"]", regex_constants::awk)));
   VERIFY(regex_match_debug("/", regex("/", regex_constants::awk)));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
index 2f8dcfb..d53cfdf 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
 #define FAIL(s) \
   try\
     {\
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
index a949f90..1e442e9 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
@@ -33,28 +33,26 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  std::regex  re("\\(a\\).*", std::regex::basic);
+  std::string target("aaba");
+  std::smatch m;
 
-	std::regex  re("\\(a\\).*", std::regex::basic);
-	std::string target("aaba");
-	std::smatch m;
+  VERIFY( regex_match_debug(target, m, re) );
 
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
-	VERIFY( m[1].first == target.begin() );
-	VERIFY( m[1].second == target.begin()+1 );
-	VERIFY( m[1].matched == true );
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
+  VERIFY( m[1].first == target.begin() );
+  VERIFY( m[1].second == target.begin()+1 );
+  VERIFY( m[1].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
index 1ba1499..8273719 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re("a\\{0,3\\}", std::regex::basic);
-	std::string target("aa");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re("a\\{0,3\\}", std::regex::basic);
+  std::string target("aa");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
index 582c480..799b804 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re("a\\{1,3\\}", std::regex::basic);
-	std::string target("aa");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re("a\\{1,3\\}", std::regex::basic);
+  std::string target("aa");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
index 3c6e07f..0ec594e 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re("a\\{2,3\\}", std::regex::basic);
-	std::string target("aa");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re("a\\{2,3\\}", std::regex::basic);
+  std::string target("aa");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
index a5661bc..d3acf5e 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::regex  re("pre/[za-x]", std::regex::extended);
     VERIFY( regex_match_debug("pre/z", re) );
@@ -70,8 +68,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   try
   {
     std::regex re("[-----]", std::regex::extended);
@@ -103,8 +99,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   try
   {
     std::regex re("[z-a]", std::regex::extended);
@@ -119,8 +113,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex re("[-0-9a-z]");
   VERIFY(regex_match_debug("-", re));
   VERIFY(regex_match_debug("1", re));
@@ -135,8 +127,6 @@ test04()
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
-
   regex lanana_namespace("^[a-z0-9]+$", regex::extended);
   regex lsb_namespace("^_?([a-z0-9_.]+-, regex::extended)+[a-z0-9]+$");
   regex debian_dpkg_conffile_cruft("dpkg-(old|dist|new|tmp, regex::extended)$");
@@ -154,8 +144,6 @@ test05()
 void
 test06()
 {
-  bool test __attribute__((unused)) = true;
-
   regex lanana_namespace("^[a-z0-9]+$");
   regex lsb_namespace("^_?([a-z0-9_.]+-)+[a-z0-9]+$");
   regex debian_dpkg_conffile_cruft("dpkg-(old|dist|new|tmp)$");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
index b4aa177..82cf96b 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::regex  re("zxcv/(one.*)abc", std::regex::ECMAScript);
     std::string target("zxcv/onetwoabc");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
index fc001ad..fb2f79a 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
@@ -34,8 +34,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::regex  re("/asdf(/.*)", std::regex::ECMAScript);
     std::string target("/asdf/qwerty");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
index 0d7080a..ab8772b 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   string domain_name = "valid.hostname.org";
   /**
    * based on http://stackoverflow.com/questions/1418423/the-hostname-regex
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc
index 01dede0..0a7fc40 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/68863.cc
@@ -30,8 +30,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(!std::regex_match("aa", std::regex("(.)(?!\\1).")));
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
index da115cb..ba66c69 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
 #define TEST(res, s) \
   {\
     regex re(res);\
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc
index db6ecc3..5e0ddbc 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   regex re("([A-Z])\\1*");
   smatch m;
   {
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
index 12c2142..71e815d 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(!regex_match_debug("x", regex("[]")));
   VERIFY(regex_match_debug("x", regex("[^]")));
   VERIFY(!regex_match_debug("]", regex("[]]")));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
index 6d6836a..8de6ad8 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     regex re("()*\\1");
     cmatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
index f403c65..20dad63 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_match_debug(":", regex("\\x3a")));
   try
     {
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
index f9a2420..6277818 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_match_debug("01", regex("\\d*")));
   VERIFY(regex_match_debug("asdfjkl", regex("\\D*")));
   VERIFY(!regex_match_debug("asdfjkl0", regex("\\D*")));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc
index a69a67a..2936e88 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/ungreedy.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   regex re("(a*?)*?");
   cmatch m;
   VERIFY(regex_match("a", m, re));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc
index 38dcc7d..2e4de78 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc
@@ -29,8 +29,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::setlocale(LC_ALL, "");
 
   std::wstring current_token(L"II.");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
index faf023f..758f6d4 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
 #define TESTL(res, s) \
   {\
     wregex re(res);\
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc
index 836e68f..ef15553 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const wchar_t * s = L"\u4f60\u597d\u002c\u0020\u4e16\u002b\u754c";
 
   wregex re(s);
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
index 1aff704..9ff06d4 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_match_debug(L"\u1234", wregex(L"\\u1234")));
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
index 745b9f5..abd2144 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex  re("(a+)", std::regex::extended);
   const char target[] = "aa";
   std::cmatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
index 5303146..81356b6 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex  re("(aa?)", std::regex::extended);
   char target[] = "a";
   std::cmatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
index 9d19a06..eb7a814 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   regex re;
   re.assign("(ab){3}", std::regex::extended);
   VERIFY(!regex_match_debug("abab", re));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
index 19a0b5f..a419801 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re(".*", std::regex::extended);
-	std::string target("aaba");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re(".*", std::regex::extended);
+  std::string target("aaba");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
index ba3de11..e2ec64e 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
@@ -32,8 +32,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex  re("a{0,3}", std::regex::extended);
   std::string target("aa");
   std::smatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
index 1d9a353..27dac9f 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re("a{1,3}", std::regex::extended);
-	std::string target("aa");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re("a{1,3}", std::regex::extended);
+  std::string target("aa");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
index da96f59..ed44ff0 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
@@ -33,25 +33,23 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	std::regex  re("a{2,3}", std::regex::extended);
-	std::string target("aa");
-	std::smatch m;
-
-	VERIFY( regex_match_debug(target, m, re) );
-
-	VERIFY( m.size()  == re.mark_count()+1 );
-	VERIFY( m.empty() == false );
-	VERIFY( m.prefix().first == target.begin() );
-	VERIFY( m.prefix().second == target.begin() );
-	VERIFY( m.prefix().matched == false );
-	VERIFY( m.suffix().first == target.end() );
-	VERIFY( m.suffix().second == target.end() );
-	VERIFY( m.suffix().matched == false );
-	VERIFY( m[0].first == target.begin() );
-	VERIFY( m[0].second == target.end() );
-	VERIFY( m[0].matched == true );
+  std::regex  re("a{2,3}", std::regex::extended);
+  std::string target("aa");
+  std::smatch m;
+
+  VERIFY( regex_match_debug(target, m, re) );
+
+  VERIFY( m.size()  == re.mark_count()+1 );
+  VERIFY( m.empty() == false );
+  VERIFY( m.prefix().first == target.begin() );
+  VERIFY( m.prefix().second == target.begin() );
+  VERIFY( m.prefix().matched == false );
+  VERIFY( m.suffix().first == target.end() );
+  VERIFY( m.suffix().second == target.end() );
+  VERIFY( m.suffix().matched == false );
+  VERIFY( m[0].first == target.begin() );
+  VERIFY( m[0].second == target.end() );
+  VERIFY( m[0].matched == true );
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
index 7921795..ff04858 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
@@ -34,8 +34,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring str2 = L"ÜBER";
   std::wregex re2;
   re2.imbue(std::locale("de_DE.UTF-8"));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc
index 9756fb4..4af05dd 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/basic_replace.cc
@@ -31,8 +31,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_replace(string("This is a string"), regex("\\b\\w*\\b"), "|$0|")
 	 == "|This||| |is||| |a||| |string|||");
   VERIFY(regex_replace(string("This is a string"), regex("\\b\\w*\\b"), "|$0|",
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc
index b92046b..169dd08 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_replace/char/dr2213.cc
@@ -29,8 +29,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   char buff[4096] = {0};
   regex re("asdf");
   cmatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc
index 66db004..b472692 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc
@@ -29,8 +29,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   string s = R"("test\")";
   VERIFY(!regex_search_debug(s, regex(R"("([^"]|\\")*[^\\]")")));
   VERIFY(!regex_match_debug(s, regex(R"("([^"]|\\")*[^\\]")")));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
index 5de9ac3..d11a2b8 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex  re("as\\(df\\)", std::regex::basic);
   std::string target("xxasdfyy");
   std::smatch m;
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
index 275ddfb..9686643 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(!regex_search_debug("2123456", regex("^1234")));
   VERIFY(regex_search_debug("123456", regex("^1234")));
   VERIFY(regex_search_debug("123456", regex("(5|^)1234")));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
index 4db1a11..69c6c2a 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   cmatch m;
   regex re("((as)(df))", regex_constants::ECMAScript | regex_constants::nosubs);
   VERIFY(regex_search_debug("asdf", m, re));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
index 46fd45d..f3d1036 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   cmatch m;
 #define TEST(i, s) VERIFY(m[i].matched && string(m[i].first, m[i].second) == s)
   VERIFY(regex_search_debug("aaaa", m, regex("a*")));
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
index 43686f8..e3df1b4 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
@@ -33,8 +33,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_search_debug("", std::regex("")));
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
index d5f4195..e8ca829 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring.cc
@@ -35,8 +35,6 @@ void test01()
 // basic_regex::operator=() resets flags. libstdc++/64680
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex re("[[:alnum:]]", std::regex_constants::basic);
   re = "\\w+";
 }
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring_op.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring_op.cc
index 96c1e6a..5905181 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring_op.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/cstring_op.cc
@@ -22,7 +22,6 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests basic_regex assign operator from a C-style null-terminated-string.  
 void test01()
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/moveable.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/moveable.cc
index fa7933e..1bf4b00 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/moveable.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/moveable.cc
@@ -28,8 +28,6 @@
 // Tests assign operator of the basic_regex class for moveable rvalues.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex src_re("aaba");
   const unsigned mark_count = src_re.mark_count();
   const std::regex::flag_type flags = src_re.flags();
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/pstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/pstring.cc
index ea45dd5..4eaf572 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/pstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/pstring.cc
@@ -22,7 +22,6 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests assign operation from a Pascal-style counted-string.  
 void test01()
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/range.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/range.cc
index e31474e..c786777 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/range.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/range.cc
@@ -22,7 +22,6 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests range assign of the basic_regex class.  
 void test01()
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string.cc
index 65f7eeb..097f466 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string.cc
@@ -28,7 +28,6 @@
 // Tests C++ string assignment of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<char> test_type;
 
   std::string s("a*b");
@@ -39,7 +38,6 @@ void test01()
 // libstdc++/64584
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::regex re("", std::regex_constants::extended);
   auto flags = re.flags();
   try
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string_op.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string_op.cc
index f47b688..6f129f4 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string_op.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/char/string_op.cc
@@ -23,7 +23,6 @@
 
 #include <string>
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests basic_regex assignment operator from a C++ string;
 void test01()
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc
index 2bf17ef..8bc6858 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring.cc
@@ -22,12 +22,10 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests assign operation from a C-style null-terminated-string.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   const wchar_t* cs = L"aab";
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc
index 00ef22a..3eaa79c 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/cstring_op.cc
@@ -22,12 +22,10 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests basic_regex assign operator from a C-style null-terminated-string.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   const wchar_t* cs = L"aab";
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc
index 0bac2a2..0aa690c 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/pstring.cc
@@ -22,7 +22,6 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests assign operation from a Pascal-style counted-string.  
 void test01()
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/range.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/range.cc
index c386fa2e..e15cd6b 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/range.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/range.cc
@@ -22,13 +22,11 @@
 // [28.8.3] class template basic_regex assign()
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests range assign of the basic_regex class.  
 void test01()
 {
   typedef std::basic_regex<wchar_t> test_type;
-  bool test __attribute__((unused)) = true;
 
   wchar_t s[] = L"a+b|c";
   test_type re;
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string.cc
index a385cea..5869cb1 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string.cc
@@ -23,12 +23,10 @@
 
 #include <string>
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests C++ string assignment of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   std::wstring s(L"a*b");
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc
index b111778..969f682 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/assign/wchar_t/string_op.cc
@@ -23,13 +23,11 @@
 
 #include <string>
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests basic_regex assignment operator from a C++ string;
 void test01()
 {
-	bool test __attribute__((unused)) = true;
-	typedef std::basic_regex<wchar_t> test_type;
+  typedef std::basic_regex<wchar_t> test_type;
 
   std::wstring s(L"a*b");
   test_type re;
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc
index 2582ff9..6e68af8 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/pstring_wchar_t.cc
@@ -27,8 +27,6 @@
 // Tests Pascal-style counted-string constructor of the basic_regex class.  
 void test01()
 {
-	bool test __attribute__((unused)) = true;
-
   const wchar_t* cs = L"aab";
 	std::wregex re(cs, 3, std::wregex::basic);
 
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc
index 1860177..45844a6 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/basic/string_range_01_02_03.cc
@@ -29,16 +29,14 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	try
-	{
-		std::regex  re("a\\{1,2,3\\}", std::regex::basic);
-	}
-	catch (std::regex_error& ex)
-	{
-		VERIFY( ex.code() == std::regex_constants::error_brace );
-	}
+  try
+    {
+      std::regex  re("a\\{1,2,3\\}", std::regex::basic);
+    }
+  catch (std::regex_error& ex)
+    {
+      VERIFY( ex.code() == std::regex_constants::error_brace );
+    }
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/cstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/cstring.cc
index 6ce9e2e..be9d241 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/cstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/cstring.cc
@@ -27,8 +27,6 @@
 void
 test01() 
 { 
-  bool test __attribute__((unused)) = true;
-
   std::regex re("(wee|week)(knights|night)", std::regex::extended);
   
   VERIFY( re.flags() == std::regex::extended );
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/string_range_01_02_03.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/string_range_01_02_03.cc
index 214e1f6..673f581 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/string_range_01_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/extended/string_range_01_02_03.cc
@@ -29,16 +29,14 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
-	try
-	{
-		std::regex  re("a{1,2,3}", std::regex::extended);
-	}
-	catch (std::regex_error& ex)
-	{
-		VERIFY( ex.code() == std::regex_constants::error_brace );
-	}
+  try
+    {
+      std::regex  re("a{1,2,3}", std::regex::extended);
+    }
+  catch (std::regex_error& ex)
+    {
+      VERIFY( ex.code() == std::regex_constants::error_brace );
+    }
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/move_char.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/move_char.cc
index 927490c..c001aca 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/move_char.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/move_char.cc
@@ -28,17 +28,16 @@
 // Tests move constructor of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<char> test_type;
 
   test_type src_re("aaba");
   const unsigned mark_count = src_re.mark_count();
-	const test_type::flag_type flags = src_re.flags();
+  const test_type::flag_type flags = src_re.flags();
 
   test_type target_re = std::move(src_re);
   
-	VERIFY( target_re.flags() == flags );
-	VERIFY( target_re.mark_count() == mark_count );
+  VERIFY( target_re.flags() == flags );
+  VERIFY( target_re.mark_count() == mark_count );
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc
index 4e48f94..2252ec7 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/string_wchar_t.cc
@@ -28,7 +28,6 @@
 // Tests C++ string constructor of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   std::wstring s(L"a*b");
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc
index e3758db..904b6df 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/cstring.cc
@@ -22,12 +22,10 @@
 // [28.8.2] class template basic_regex constructor
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests C-style null-terminated-string constructor of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   const wchar_t* cs = L"aab";
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc
index 84bcbd6..daf132d 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/default.cc
@@ -22,12 +22,10 @@
 // [28.8.2] class template basic_regex constructor
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests default constructor of the basic_regex class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   // default constructor
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc
index 98820ec..8e57e99 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/wchar_t/range.cc
@@ -22,12 +22,10 @@
 // [28.8.2] class template basic_regex constructor
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests range constructor of the basic_regex class.  
 void test01()
 {
-	bool test __attribute__((unused)) = true;
   typedef std::basic_regex<wchar_t> test_type;
 
   wchar_t s[] = L"a+b|c";
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/imbue/string.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/imbue/string.cc
index 2a3afdb..6042f9b 100644
--- a/libstdc++-v3/testsuite/28_regex/basic_regex/imbue/string.cc
+++ b/libstdc++-v3/testsuite/28_regex/basic_regex/imbue/string.cc
@@ -26,8 +26,6 @@
 // libstdc++/64585
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   static const char s[] = "a";
   std::regex re("a");
   VERIFY(std::regex_search(s, re));
diff --git a/libstdc++-v3/testsuite/28_regex/constants/error_type.cc b/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
index 23d851b..2c424d5 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/error_type.cc
@@ -22,28 +22,25 @@
 // 28.5.3 
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  std::regex_constants::error_type err __attribute__((unused));
 
-	std::regex_constants::error_type err __attribute__((unused));
-
-	err = std::regex_constants::error_collate;
-	err = std::regex_constants::error_ctype;
-	err = std::regex_constants::error_escape;
-	err = std::regex_constants::error_backref;
-	err = std::regex_constants::error_brack;
-	err = std::regex_constants::error_paren;
-	err = std::regex_constants::error_brace;
-	err = std::regex_constants::error_badbrace;
-	err = std::regex_constants::error_range;
-	err = std::regex_constants::error_space;
-	err = std::regex_constants::error_badrepeat;
-	err = std::regex_constants::error_complexity;
-	err = std::regex_constants::error_stack;
+  err = std::regex_constants::error_collate;
+  err = std::regex_constants::error_ctype;
+  err = std::regex_constants::error_escape;
+  err = std::regex_constants::error_backref;
+  err = std::regex_constants::error_brack;
+  err = std::regex_constants::error_paren;
+  err = std::regex_constants::error_brace;
+  err = std::regex_constants::error_badbrace;
+  err = std::regex_constants::error_range;
+  err = std::regex_constants::error_space;
+  err = std::regex_constants::error_badrepeat;
+  err = std::regex_constants::error_complexity;
+  err = std::regex_constants::error_stack;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc b/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
index b007e5f..d1e7c37 100644
--- a/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
+++ b/libstdc++-v3/testsuite/28_regex/constants/match_flag_type.cc
@@ -22,27 +22,24 @@
 // 28.5.1 
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  std::regex_constants::match_flag_type flag = std::regex_constants::match_default;
 
-	std::regex_constants::match_flag_type flag = std::regex_constants::match_default;
-
-	flag |= std::regex_constants::match_not_bol;
-	flag |= std::regex_constants::match_not_eol;
-	flag |= std::regex_constants::match_not_bow;
-	flag |= std::regex_constants::match_not_eow;
-	flag |= std::regex_constants::match_any;
-	flag |= std::regex_constants::match_not_null;
-	flag |= std::regex_constants::match_continuous;
-	flag |= std::regex_constants::match_prev_avail;
-	flag |= std::regex_constants::format_default;
-	flag |= std::regex_constants::format_sed;
-	flag |= std::regex_constants::format_no_copy;
-	flag |= std::regex_constants::format_first_only;
+  flag |= std::regex_constants::match_not_bol;
+  flag |= std::regex_constants::match_not_eol;
+  flag |= std::regex_constants::match_not_bow;
+  flag |= std::regex_constants::match_not_eow;
+  flag |= std::regex_constants::match_any;
+  flag |= std::regex_constants::match_not_null;
+  flag |= std::regex_constants::match_continuous;
+  flag |= std::regex_constants::match_prev_avail;
+  flag |= std::regex_constants::format_default;
+  flag |= std::regex_constants::format_sed;
+  flag |= std::regex_constants::format_no_copy;
+  flag |= std::regex_constants::format_first_only;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/28_regex/init-list.cc b/libstdc++-v3/testsuite/28_regex/init-list.cc
index 8f92308..09b1280 100644
--- a/libstdc++-v3/testsuite/28_regex/init-list.cc
+++ b/libstdc++-v3/testsuite/28_regex/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01(void)
+void test01(void)
 {
-  bool test = true;
-
   regex r = { 'a', 'b', 'c' };
   cmatch res;
   VERIFY(regex_match ("abc", res, r));
@@ -35,8 +33,6 @@ int test01(void)
   r = { 'd', 'e', 'f' };
   VERIFY(regex_match ("def", res, r));
   VERIFY(!regex_match ("abc", res, r));
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/64140.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/64140.cc
index 2359d85..f6bfe26 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/64140.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/64140.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::regex e("z*");
   const std::string s("ab");
 
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_01.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_01.cc
index 9b42ed1..eab9815 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_01.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::basic_regex<char> re("asdf");
   const char s[] = "ffasdf88asdf99asdf00asdf77";
   int cnt = 0;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_position_01.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_position_01.cc
index fda0d9c..db7b04a 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_position_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/char/string_position_01.cc
@@ -30,8 +30,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex re("asdf");
   std::string s("asdfasdfasdf");
   int i = 0;
@@ -46,8 +44,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::regex re("\\w+");
   std::string s("-a-b-c-");
 
@@ -75,8 +71,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::smatch m;
   std::string s = "abcde";
   std::regex_search(s, m, std::regex("bcd"));
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc
index 111b7ad..53d55d31 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/char/default.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_iterator<char*> it;
 	std::cregex_iterator cit;
 	std::sregex_iterator sit;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/default.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/default.cc
index a6937f9..f745097 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/ctors/wchar_t/default.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_iterator<wchar_t*> it;
 	std::wcregex_iterator cit;
 	std::wsregex_iterator sit;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/typedefs.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/typedefs.cc
index 6566beb..35fe0fa 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/typedefs.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/typedefs.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::regex_iterator<char*> it;
 
   typedef it::regex_type         regex_type;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc
index a84a3a8..7a48dad 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_01.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::basic_regex<wchar_t> re(L"asdf");
   const wchar_t s[] = L"ffasdf88asdf99asdf00asdf77";
   int cnt = 0;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc
index f9d13cd..fde1006 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_iterator/wchar_t/string_02.cc
@@ -30,8 +30,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::setlocale(LC_ALL, "en_US.UTF-8");
 
   std::wstring str2 = L"ä\u2009Ä\u2009ö\u2009Ö\u2009ü\u2009Ü";
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/64303.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/64303.cc
index aab10e5..0a7087b 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/64303.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/64303.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string s("  111  222  ");
   const std::regex re("\\w+");
 
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc
index bc6d751..9d10e8f 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/char/string_01.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::basic_regex<char> re(" ");
   const char s[] = "Quick brown fox.";
   int cnt = 0;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/char/default.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/char/default.cc
index a240b36..4c58414 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/char/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/char/default.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_token_iterator<char*> it;
 	std::cregex_token_iterator cit;
 	std::sregex_token_iterator sit;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/default.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/default.cc
index c57c8eb..18183ec 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/ctors/wchar_t/default.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_token_iterator<wchar_t*> it;
 	std::wcregex_token_iterator cit;
 	std::wsregex_token_iterator sit;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc
index 0980350e..b9ac98e 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/typedefs.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::regex_token_iterator<char*> it;
 
   typedef it::regex_type         regex_type;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/string_01.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/string_01.cc
index 463634a..8feb2b8 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/string_01.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::basic_regex<wchar_t> re(L" ");
   const wchar_t s[] = L"Quick brown fox.";
   int cnt = 0;
diff --git a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/wstring_02.cc b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/wstring_02.cc
index 3221548..5c66fee 100644
--- a/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/wstring_02.cc
+++ b/libstdc++-v3/testsuite/28_regex/iterators/regex_token_iterator/wchar_t/wstring_02.cc
@@ -30,8 +30,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::setlocale(LC_ALL, "en_US.UTF-8");
 
   std::wstring str2 = L"öäü";
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
index 8e880d6..fb49bc3 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/default.cc
@@ -27,8 +27,6 @@
 // Tests default constructor of the match_result class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::cmatch cm;
   VERIFY( cm.size() == 0 );
   VERIFY( !cm.ready() );
@@ -36,8 +34,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::smatch sm;
   VERIFY( sm.size() == 0 );
   VERIFY( !sm.ready() );
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc b/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
index 2e95aaa..425184f 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/ctors/wchar_t/default.cc
@@ -27,8 +27,6 @@
 // Tests default constructor of the match_result class.  
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wcmatch cm;
   VERIFY( cm.size() == 0 );
   VERIFY( !cm.ready() );
@@ -36,8 +34,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wsmatch sm;
   VERIFY( sm.size() == 0 );
   VERIFY( !sm.ready() );
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/format.cc b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
index bf37ce5..ff047c5 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/format.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
@@ -33,8 +33,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   cmatch m;
   VERIFY(regex_search_debug("*** this is a string !!!", m,
 			    regex("(\\w+) (\\w+) (\\w+) (\\w+)")));
@@ -48,8 +46,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   regex re("asdf");
   cmatch m;
   regex_match("asdf", m, re);
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/out_of_range_submatches.cc b/libstdc++-v3/testsuite/28_regex/match_results/out_of_range_submatches.cc
index e096f5d..eb83131 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/out_of_range_submatches.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/out_of_range_submatches.cc
@@ -28,8 +28,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const char s[] = "abc";
   const std::regex re("(\\d+)|(\\w+)");
 
@@ -55,8 +53,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::match_results<const char*> m;
   const char s[] = "a";
   VERIFY(regex_search_debug(s, m, std::regex("a")));
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/swap.cc b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc
index 4db85f4..b25b02d 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/swap.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/swap.cc
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::cmatch m;
   std::regex_match("a", m, std::regex("a"));
   std::cmatch mm1 = m, mm2;
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/typedefs.cc b/libstdc++-v3/testsuite/28_regex/match_results/typedefs.cc
index 1d31318..ad96752 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/typedefs.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/typedefs.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::match_results<char*> mr;
 
   typedef mr::value_type       value_type;
diff --git a/libstdc++-v3/testsuite/28_regex/regex_error/regex_error.cc b/libstdc++-v3/testsuite/28_regex/regex_error/regex_error.cc
index 11744a9..a87f0e5 100644
--- a/libstdc++-v3/testsuite/28_regex/regex_error/regex_error.cc
+++ b/libstdc++-v3/testsuite/28_regex/regex_error/regex_error.cc
@@ -27,18 +27,16 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
+  std::regex_error error(std::regex_constants::error_collate);
+  VERIFY(error.code() == std::regex_constants::error_collate);
 
-	std::regex_error error(std::regex_constants::error_collate);
-	VERIFY(error.code() == std::regex_constants::error_collate);
-
-	try
-	{
-		throw error;
-	}
-	catch (std::runtime_error& ex)
-	{
-	}
+  try
+    {
+      throw error;
+    }
+  catch (std::runtime_error& ex)
+    {
+    }
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/28_regex/regression.cc b/libstdc++-v3/testsuite/28_regex/regression.cc
index 53a19af..effb356 100644
--- a/libstdc++-v3/testsuite/28_regex/regression.cc
+++ b/libstdc++-v3/testsuite/28_regex/regression.cc
@@ -28,16 +28,12 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   regex re("((.)", regex_constants::basic);
 }
 
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string re_str
     {
       "/abcd" "\n"
@@ -51,8 +47,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_match_debug("a.", regex(R"(a\b.)"), regex_constants::match_not_eow));
   VERIFY(regex_match_debug(".a", regex(R"(.\ba)"), regex_constants::match_not_bow));
   VERIFY(regex_search_debug("a", regex(R"(^\b)")));
@@ -65,8 +59,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   static const char* kNumericAnchor ="(\\$|usd)(usd|\\$|to|and|up to|[0-9,\\.\\-\\sk])+";
   const std::regex re(kNumericAnchor);
   (void)re;
@@ -75,8 +67,6 @@ test04()
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY(regex_match_debug("!", std::regex("[![:alnum:]]")));
   VERIFY(regex_match_debug("-", std::regex("[a-]", regex_constants::basic)));
   VERIFY(regex_match_debug("-", std::regex("[a-]")));
diff --git a/libstdc++-v3/testsuite/28_regex/sub_match/cast_char.cc b/libstdc++-v3/testsuite/28_regex/sub_match/cast_char.cc
index 9a947c6..267f4e5 100644
--- a/libstdc++-v3/testsuite/28_regex/sub_match/cast_char.cc
+++ b/libstdc++-v3/testsuite/28_regex/sub_match/cast_char.cc
@@ -28,19 +28,17 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef char                          value_type;
   typedef std::basic_string<value_type> string_type;
   typedef std::sub_match<value_type*>   sub_match_type;
   value_type test_data[] = "cabbage";
 
-	sub_match_type sm;
-	sm.first = std::begin(test_data);
-	sm.second  = std::end(test_data) - 1;
-	sm.matched = true;
+  sub_match_type sm;
+  sm.first = std::begin(test_data);
+  sm.second  = std::end(test_data) - 1;
+  sm.matched = true;
 
-	string_type sm_string = sm;
+  string_type sm_string = sm;
 
-	VERIFY( sm_string == string_type(test_data) );
+  VERIFY( sm_string == string_type(test_data) );
 }
diff --git a/libstdc++-v3/testsuite/28_regex/sub_match/cast_wchar_t.cc b/libstdc++-v3/testsuite/28_regex/sub_match/cast_wchar_t.cc
index c74bde0..49f9bd3 100644
--- a/libstdc++-v3/testsuite/28_regex/sub_match/cast_wchar_t.cc
+++ b/libstdc++-v3/testsuite/28_regex/sub_match/cast_wchar_t.cc
@@ -28,19 +28,17 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef wchar_t                       value_type;
   typedef std::basic_string<value_type> string_type;
   typedef std::sub_match<value_type*>   sub_match_type;
   value_type test_data[] = L"cabbage";
 
-	sub_match_type sm;
-	sm.first = std::begin(test_data);
-	sm.second  = std::end(test_data) - 1;
-	sm.matched = true;
+  sub_match_type sm;
+  sm.first = std::begin(test_data);
+  sm.second  = std::end(test_data) - 1;
+  sm.matched = true;
 
-	string_type sm_string = sm;
+  string_type sm_string = sm;
 
-	VERIFY( sm_string == string_type(test_data) );
+  VERIFY( sm_string == string_type(test_data) );
 }
diff --git a/libstdc++-v3/testsuite/28_regex/sub_match/embedded_zeros_cmp.cc b/libstdc++-v3/testsuite/28_regex/sub_match/embedded_zeros_cmp.cc
index 3964482..9244f9d 100644
--- a/libstdc++-v3/testsuite/28_regex/sub_match/embedded_zeros_cmp.cc
+++ b/libstdc++-v3/testsuite/28_regex/sub_match/embedded_zeros_cmp.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef char                          value_type;
   typedef std::basic_string<value_type> string_type;
   typedef std::sub_match<value_type*>   sub_match_type;
@@ -37,19 +35,19 @@ int main()
   value_type test_data2[] = {'a', 'b', 'c'};
   const string_type test_data3("abc");
 
-	sub_match_type sm;
-	sm.first = std::begin(test_data2);
-	sm.second  = std::end(test_data2);
-	sm.matched = true;
-
-	VERIFY( test_data1 != sm );
-	VERIFY( sm != test_data1 );
-	VERIFY( sm < test_data1 );
-	VERIFY( !(test_data1 < sm) );
-	VERIFY( test_data1 > sm );
-
-	VERIFY( test_data3 == sm );
-	VERIFY( sm == test_data3 );
-	VERIFY( !(sm < test_data3) );
-	VERIFY( !(test_data3 < sm) );
+  sub_match_type sm;
+  sm.first = std::begin(test_data2);
+  sm.second  = std::end(test_data2);
+  sm.matched = true;
+
+  VERIFY( test_data1 != sm );
+  VERIFY( sm != test_data1 );
+  VERIFY( sm < test_data1 );
+  VERIFY( !(test_data1 < sm) );
+  VERIFY( test_data1 > sm );
+
+  VERIFY( test_data3 == sm );
+  VERIFY( sm == test_data3 );
+  VERIFY( !(sm < test_data3) );
+  VERIFY( !(test_data3 < sm) );
 }
diff --git a/libstdc++-v3/testsuite/28_regex/sub_match/length.cc b/libstdc++-v3/testsuite/28_regex/sub_match/length.cc
index 403a625..6f6bb24 100644
--- a/libstdc++-v3/testsuite/28_regex/sub_match/length.cc
+++ b/libstdc++-v3/testsuite/28_regex/sub_match/length.cc
@@ -29,22 +29,20 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::sub_match<const char*> sm_t;
   const char*           test_data = "cabbage";
   sm_t::difference_type test_len = 3;
 
-	sm_t sm1;
-	sm1.first   = test_data + 0;
-	sm1.second  = test_data + test_len;
-	sm1.matched = true;
+  sm_t sm1;
+  sm1.first   = test_data + 0;
+  sm1.second  = test_data + test_len;
+  sm1.matched = true;
 
-	sm_t sm2;
-	sm2.matched = false;
+  sm_t sm2;
+  sm2.matched = false;
 
-	VERIFY( sm1.length() == test_len );
-	VERIFY( sm2.length() == 0 );
+  VERIFY( sm1.length() == test_len );
+  VERIFY( sm2.length() == 0 );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/ctor.cc b/libstdc++-v3/testsuite/28_regex/traits/char/ctor.cc
index 629cb56..5ab5749 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/ctor.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/ctor.cc
@@ -22,13 +22,11 @@
 // [28.7] class template regex_traits
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests default constructor of the regex_traits class.  There is only the
 // default constructor.
 void test01()
 {
-	bool test __attribute__((unused)) = true;
   typedef std::regex_traits<char> test_type;
 
   // required default constructor
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
index b71796b..01f8a6f 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
@@ -31,7 +31,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
 
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/length.cc b/libstdc++-v3/testsuite/28_regex/traits/char/length.cc
index e38aa67..ddd00f8 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/length.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/length.cc
@@ -33,16 +33,15 @@ test01()
 {
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
-  bool test __attribute__((unused)) = true;
   const CharT* p = "";
 
-	std::size_t i = traits::length(p);
+  std::size_t i = traits::length(p);
 
-	VERIFY( i == 0 );
+  VERIFY( i == 0 );
 }
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/lookup_classname.cc b/libstdc++-v3/testsuite/28_regex/traits/char/lookup_classname.cc
index 25c07ae..6b93d61 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/lookup_classname.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/lookup_classname.cc
@@ -31,20 +31,19 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
 
-	char n1[] = "lower";
-	char n2[] = "alpha";
-	traits t;
+  char n1[] = "lower";
+  char n2[] = "alpha";
+  traits t;
 
   traits::char_class_type c1 = t.lookup_classname(n1, n1+sizeof(n1)-1);
   VERIFY( c1 != 0 );
 
   traits::char_class_type c2 = t.lookup_classname(n1, n1+sizeof(n1)-1, true);
   traits::char_class_type c3 = t.lookup_classname(n2, n2+sizeof(n2)-1, true);
-	VERIFY( c2 == c3 );
+  VERIFY( c2 == c3 );
 }
 
 // Test forward iterator
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/lookup_collatename.cc b/libstdc++-v3/testsuite/28_regex/traits/char/lookup_collatename.cc
index a40c1bc..7fcbc2f 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/lookup_collatename.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/lookup_collatename.cc
@@ -31,7 +31,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
 
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/transform.cc b/libstdc++-v3/testsuite/28_regex/traits/char/transform.cc
index ddcb94e..e3eda19 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/transform.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/transform.cc
@@ -31,13 +31,12 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
 
-	traits t;
-	traits::string_type G = "abc";
-	traits::string_type H = "def";
+  traits t;
+  traits::string_type G = "abc";
+  traits::string_type H = "def";
 
   VERIFY( G < H );
   VERIFY( t.transform(G.begin(), G.end()) < t.transform(H.begin(), H.end()) );
@@ -45,6 +44,6 @@ test01()
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/transform_primary.cc b/libstdc++-v3/testsuite/28_regex/traits/char/transform_primary.cc
index 17c5ca3..2a65256 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/transform_primary.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/transform_primary.cc
@@ -31,14 +31,13 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
   typedef std::regex_traits<CharT> traits;
 
-	traits t;
-	traits::string_type G = "abc";
-	traits::string_type H = "def";
-	traits::string_type J = "ABC";
+  traits t;
+  traits::string_type G = "abc";
+  traits::string_type H = "def";
+  traits::string_type J = "ABC";
 
   VERIFY( G < H );
   VERIFY( t.transform_primary(G.begin(), G.end())
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/translate.cc b/libstdc++-v3/testsuite/28_regex/traits/char/translate.cc
index e198656..6709d63 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/translate.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/translate.cc
@@ -32,7 +32,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
 
   std::regex_traits<CharT> t;
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/translate_nocase.cc b/libstdc++-v3/testsuite/28_regex/traits/char/translate_nocase.cc
index d438646..fab1859 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/translate_nocase.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/translate_nocase.cc
@@ -27,7 +27,6 @@
 // Verifies the workings of the regex_traits translate_nocase function.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef char CharT;
 
   std::regex_traits<CharT> t;
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc b/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
index 926c07c..4af0563 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/user_defined.cc
@@ -45,8 +45,6 @@ template<typename CharT>
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   basic_regex<char, MyRegexTraits<char>> re(".");
   VERIFY(!regex_match("\n", re));
   VERIFY(!regex_match("\r", re));
diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/value.cc b/libstdc++-v3/testsuite/28_regex/traits/char/value.cc
index 1a11986..cecfc87 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/value.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/value.cc
@@ -27,7 +27,6 @@
 // Tests the value() function of the regex_traits<char> class.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_traits<char> t;
   VERIFY( t.value('7', 8)  == 7 );
   VERIFY( t.value('7', 10) == 7 );
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/ctor.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/ctor.cc
index 32aa46a..378ce35 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/ctor.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/ctor.cc
@@ -22,7 +22,6 @@
 // [28.7] class template regex_traits
 
 #include <regex>
-#include <testsuite_hooks.h>
 
 // Tests default constructor of the regex_traits class.  There is only the
 // default constructor.
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc
index 8ab25ee..bcaafb7 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc
@@ -28,7 +28,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
 
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/length.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/length.cc
index f4b786e..ff5c528 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/length.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/length.cc
@@ -33,16 +33,15 @@ test01()
 {
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
-  bool test __attribute__((unused)) = true;
   const CharT* p = L"";
 
-	std::size_t i = traits::length(p);
+  std::size_t i = traits::length(p);
 
-	VERIFY( i == 0 );
+  VERIFY( i == 0 );
 }
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_classname.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_classname.cc
index 6c9bb49..665ce17 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_classname.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_classname.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
 
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_collatename.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_collatename.cc
index 8e3437c..171f248 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_collatename.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/lookup_collatename.cc
@@ -28,7 +28,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
 
@@ -39,6 +38,6 @@ test01()
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform.cc
index da49cd3..795f62a 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform.cc
@@ -31,13 +31,12 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
 
-	traits t;
-	traits::string_type G = L"abc";
-	traits::string_type H = L"def";
+  traits t;
+  traits::string_type G = L"abc";
+  traits::string_type H = L"def";
 
   VERIFY( G < H );
   VERIFY( t.transform(G.begin(), G.end()) < t.transform(H.begin(), H.end()) );
@@ -45,6 +44,6 @@ test01()
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform_primary.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform_primary.cc
index 97742cc..0a6fb92 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform_primary.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/transform_primary.cc
@@ -29,14 +29,13 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
   typedef std::regex_traits<CharT> traits;
 
-	traits t;
-	traits::string_type G = L"abc";
-	traits::string_type H = L"def";
-	traits::string_type J = L"ABC";
+  traits t;
+  traits::string_type G = L"abc";
+  traits::string_type H = L"def";
+  traits::string_type J = L"ABC";
 
   VERIFY( G < H );
   VERIFY( t.transform_primary(G.begin(), G.end())
@@ -49,6 +48,6 @@ test01()
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate.cc
index 5e53b71..abf822b 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate.cc
@@ -31,7 +31,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
 
   std::regex_traits<CharT> t;
@@ -43,6 +42,6 @@ test01()
 
 int main()
 {
-	test01();
-	return 0;
+  test01();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate_nocase.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate_nocase.cc
index 92901f9..a935b1a 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate_nocase.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/translate_nocase.cc
@@ -27,7 +27,6 @@
 // Verifies the workings of the regex_traits translate_nocase function.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef wchar_t CharT;
 
   std::regex_traits<CharT> t;
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/user_defined.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/user_defined.cc
index b81d4e2..901e042 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/user_defined.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/user_defined.cc
@@ -45,8 +45,6 @@ template<typename CharT>
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   basic_regex<wchar_t, MyRegexTraits<wchar_t>> re(L".");
   VERIFY(!regex_match(L"\n", re));
   VERIFY(!regex_match(L"\r", re));
diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/value.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/value.cc
index 1dc643c..92dd046 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/value.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/value.cc
@@ -27,7 +27,6 @@
 // Tests the value() function of the regex_traits<wchar_t> class.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::regex_traits<wchar_t> t;
   VERIFY( t.value(L'7', 8)  == 7 );
   VERIFY( t.value(L'7', 10) == 7 );
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
index 2daa2dc..cf14e8e 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
@@ -34,8 +34,6 @@ struct Bar {
 int
 main ()
 {
-  bool test __attribute__((unused)) = true;
-
   std::atomic<Foo*> a;
   std::atomic<Bar*> b;
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
index 9aa7cb0..7b013d4 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
@@ -26,8 +26,6 @@
 // pointer arithimetic vs. atomic<_Tp*> specialization
 int main(void)
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
 
   typedef int 	value_type;
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc
index d695cc8..1457dc9 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc
@@ -23,7 +23,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
   std::atomic_flag f = ATOMIC_FLAG_INIT;
 
   f.clear(); // set to false
diff --git a/libstdc++-v3/testsuite/backward/11460.cc b/libstdc++-v3/testsuite/backward/11460.cc
index 01d33b2..8aa5599 100644
--- a/libstdc++-v3/testsuite/backward/11460.cc
+++ b/libstdc++-v3/testsuite/backward/11460.cc
@@ -35,8 +35,6 @@ public:
 // libstdc++/11460
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::strstreambuf::traits_type Traits;
   const char str[] = "a\xff";
   
diff --git a/libstdc++-v3/testsuite/backward/hash_map/1.cc b/libstdc++-v3/testsuite/backward/hash_map/1.cc
index a662df6..a9b4210 100644
--- a/libstdc++-v3/testsuite/backward/hash_map/1.cc
+++ b/libstdc++-v3/testsuite/backward/hash_map/1.cc
@@ -66,7 +66,6 @@ namespace __gnu_cxx
 void test01()
 {
   const int Size = 5;
-  bool test __attribute__((unused)) = true;
 
   using std::string;
   using std::pair;
diff --git a/libstdc++-v3/testsuite/backward/hash_map/25896.cc b/libstdc++-v3/testsuite/backward/hash_map/25896.cc
index 1ec565b..cf1610b 100644
--- a/libstdc++-v3/testsuite/backward/hash_map/25896.cc
+++ b/libstdc++-v3/testsuite/backward/hash_map/25896.cc
@@ -56,8 +56,6 @@ namespace __gnu_cxx
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_cxx::hash_map<std::string, int> Map;
   typedef Map::iterator       iterator;
   typedef Map::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/backward/hash_set/1.cc b/libstdc++-v3/testsuite/backward/hash_set/1.cc
index 3ecc424..aea81e2 100644
--- a/libstdc++-v3/testsuite/backward/hash_set/1.cc
+++ b/libstdc++-v3/testsuite/backward/hash_set/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const int werte[] = { 1, 25, 9, 16, -36};
   const int anzahl = sizeof(werte) / sizeof(int);
   __gnu_cxx::hash_set<int> intTable(werte, werte + anzahl);
diff --git a/libstdc++-v3/testsuite/backward/hash_set/25896.cc b/libstdc++-v3/testsuite/backward/hash_set/25896.cc
index 57ae481..bfedf51 100644
--- a/libstdc++-v3/testsuite/backward/hash_set/25896.cc
+++ b/libstdc++-v3/testsuite/backward/hash_set/25896.cc
@@ -56,8 +56,6 @@ namespace __gnu_cxx
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_cxx::hash_set<std::string> Set;
   typedef Set::iterator       iterator;
   typedef Set::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/decimal/binary-arith.cc b/libstdc++-v3/testsuite/decimal/binary-arith.cc
index 2236592..eb6ac3e 100644
--- a/libstdc++-v3/testsuite/decimal/binary-arith.cc
+++ b/libstdc++-v3/testsuite/decimal/binary-arith.cc
@@ -37,7 +37,6 @@ unsigned long long ull = 50;
 void
 binary_add_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = si + a;   VERIFY (b == 980);
@@ -64,7 +63,6 @@ binary_add_32 (void)
 void
 binary_subtract_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a - si;   VERIFY (b == 1020);
@@ -92,7 +90,6 @@ binary_subtract_32 (void)
 void
 binary_multiply_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a * si;   VERIFY (b == -20000);
@@ -119,7 +116,6 @@ binary_multiply_32 (void)
 void
 binary_divide_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a / si;   VERIFY (b == -50);
@@ -147,7 +143,6 @@ binary_divide_32 (void)
 void
 binary_add_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a + si;   VERIFY (b == 980);
@@ -174,7 +169,6 @@ binary_add_64 (void)
 void
 binary_subtract_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a - si;   VERIFY (b == 1020);
@@ -202,7 +196,6 @@ binary_subtract_64 (void)
 void
 binary_multiply_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a * si;   VERIFY (b == -20000);
@@ -229,7 +222,6 @@ binary_multiply_64 (void)
 void
 binary_divide_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a / si;   VERIFY (b == -50);
@@ -257,7 +249,6 @@ binary_divide_64 (void)
 void
 binary_add_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a + si;   VERIFY (b == 980);
@@ -284,7 +275,6 @@ binary_add_128 (void)
 void
 binary_subtract_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a - si;   VERIFY (b == 1020);
@@ -312,7 +302,6 @@ binary_subtract_128 (void)
 void
 binary_multiply_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a * si;   VERIFY (b == -20000);
@@ -339,7 +328,6 @@ binary_multiply_128 (void)
 void
 binary_divide_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a / si;   VERIFY (b == -50);
diff --git a/libstdc++-v3/testsuite/decimal/comparison.cc b/libstdc++-v3/testsuite/decimal/comparison.cc
index cf9716f..5834e4e 100644
--- a/libstdc++-v3/testsuite/decimal/comparison.cc
+++ b/libstdc++-v3/testsuite/decimal/comparison.cc
@@ -37,7 +37,6 @@ unsigned long long ull = 50;
 void
 compare_eq_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
 
   a = si;   VERIFY (a == si);   VERIFY (si == a);
@@ -54,7 +53,6 @@ compare_eq_32 (void)
 void
 compare_ne_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a = 100;
 
   VERIFY (a != si);   VERIFY (si != a);
@@ -71,7 +69,6 @@ compare_ne_32 (void)
 void
 compare_lt_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a = -100;
 
   VERIFY (a < si);
@@ -99,7 +96,6 @@ compare_lt_32 (void)
 void
 compare_le_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
 
   a = si;   VERIFY (a <= si);   VERIFY (si <= a);
@@ -138,7 +134,6 @@ compare_le_32 (void)
 void
 compare_gt_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a = 100;
 
   VERIFY (a > si);
@@ -166,7 +161,6 @@ compare_gt_32 (void)
 void
 compare_ge_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
 
   a = si;   VERIFY (a >= si);   VERIFY (si <= a);
@@ -205,7 +199,6 @@ compare_ge_32 (void)
 void
 compare_eq_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
 
   a = si;   VERIFY (a == si);   VERIFY (si == a);
@@ -222,7 +215,6 @@ compare_eq_64 (void)
 void
 compare_ne_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a = 100;
 
   VERIFY (a != si);   VERIFY (si != a);
@@ -239,7 +231,6 @@ compare_ne_64 (void)
 void
 compare_lt_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a = -100;
 
   VERIFY (a < si);
@@ -267,7 +258,6 @@ compare_lt_64 (void)
 void
 compare_le_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
 
   a = si;   VERIFY (a <= si);   VERIFY (si <= a);
@@ -306,7 +296,6 @@ compare_le_64 (void)
 void
 compare_gt_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a = 100;
 
   VERIFY (a > si);
@@ -334,7 +323,6 @@ compare_gt_64 (void)
 void
 compare_ge_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
 
   a = si;   VERIFY (a >= si);   VERIFY (si <= a);
@@ -373,7 +361,6 @@ compare_ge_64 (void)
 void
 compare_eq_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
 
   a = si;   VERIFY (a == si);   VERIFY (si == a);
@@ -390,7 +377,6 @@ compare_eq_128 (void)
 void
 compare_ne_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a = 100;
 
   VERIFY (a != si);   VERIFY (si != a);
@@ -407,7 +393,6 @@ compare_ne_128 (void)
 void
 compare_lt_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a = -100;
 
   VERIFY (a < si);
@@ -435,7 +420,6 @@ compare_lt_128 (void)
 void
 compare_le_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
 
   a = si;   VERIFY (a <= si);   VERIFY (si <= a);
@@ -474,7 +458,6 @@ compare_le_128 (void)
 void
 compare_gt_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a = 100;
 
   VERIFY (a > si);
@@ -502,7 +485,6 @@ compare_gt_128 (void)
 void
 compare_ge_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
 
   a = si;   VERIFY (a >= si);   VERIFY (si <= a);
diff --git a/libstdc++-v3/testsuite/decimal/compound-assignment-memfunc.cc b/libstdc++-v3/testsuite/decimal/compound-assignment-memfunc.cc
index c19d611..aa2a756 100644
--- a/libstdc++-v3/testsuite/decimal/compound-assignment-memfunc.cc
+++ b/libstdc++-v3/testsuite/decimal/compound-assignment-memfunc.cc
@@ -41,7 +41,6 @@ unsigned long long ull = 50;
 void
 compound_assignment_add_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b.operator+=(d32);  VERIFY (b == 1005);
@@ -58,7 +57,6 @@ compound_assignment_add_32 (void)
 void
 compound_assignment_subtract_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b.operator-=(d32);  VERIFY (b == 995);
@@ -75,7 +73,6 @@ compound_assignment_subtract_32 (void)
 void
 compound_assignment_multiply_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b.operator*=(d32);  VERIFY (b == 5000);
@@ -92,7 +89,6 @@ compound_assignment_multiply_32 (void)
 void
 compound_assignment_divide_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b.operator/=(d32);  VERIFY (b == 200);
@@ -109,7 +105,6 @@ compound_assignment_divide_32 (void)
 void
 compound_assignment_add_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b.operator+=(d32);  VERIFY (b == 1005);
@@ -126,7 +121,6 @@ compound_assignment_add_64 (void)
 void
 compound_assignment_subtract_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b.operator-=(d32);  VERIFY (b == 995);
@@ -143,7 +137,6 @@ compound_assignment_subtract_64 (void)
 void
 compound_assignment_multiply_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b.operator*=(d32);  VERIFY (b == 5000);
@@ -160,7 +153,6 @@ compound_assignment_multiply_64 (void)
 void
 compound_assignment_divide_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b.operator/=(d32);  VERIFY (b == 200);
@@ -177,7 +169,6 @@ compound_assignment_divide_64 (void)
 void
 compound_assignment_add_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b.operator+=(d32);  VERIFY (b == 1005);
@@ -194,7 +185,6 @@ compound_assignment_add_128 (void)
 void
 compound_assignment_subtract_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b.operator-=(d32);  VERIFY (b == 995);
@@ -211,7 +201,6 @@ compound_assignment_subtract_128 (void)
 void
 compound_assignment_multiply_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b.operator*=(d32);  VERIFY (b == 5000);
@@ -228,7 +217,6 @@ compound_assignment_multiply_128 (void)
 void
 compound_assignment_divide_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b.operator/=(d32);  VERIFY (b == 200);
diff --git a/libstdc++-v3/testsuite/decimal/compound-assignment.cc b/libstdc++-v3/testsuite/decimal/compound-assignment.cc
index e14b72a..ff70268 100644
--- a/libstdc++-v3/testsuite/decimal/compound-assignment.cc
+++ b/libstdc++-v3/testsuite/decimal/compound-assignment.cc
@@ -39,7 +39,6 @@ unsigned long long ull = 50;
 void
 compound_assignment_add_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b += d32;  VERIFY (b == 1005);
@@ -56,7 +55,6 @@ compound_assignment_add_32 (void)
 void
 compound_assignment_subtract_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b -= d32;  VERIFY (b == 995);
@@ -73,7 +71,6 @@ compound_assignment_subtract_32 (void)
 void
 compound_assignment_multiply_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b *= d32;  VERIFY (b == 5000);
@@ -90,7 +87,6 @@ compound_assignment_multiply_32 (void)
 void
 compound_assignment_divide_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a (1000), b;
 
   b = a; b /= d32;  VERIFY (b == 200);
@@ -107,7 +103,6 @@ compound_assignment_divide_32 (void)
 void
 compound_assignment_add_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b += d32;  VERIFY (b == 1005);
@@ -124,7 +119,6 @@ compound_assignment_add_64 (void)
 void
 compound_assignment_subtract_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b -= d32;  VERIFY (b == 995);
@@ -141,7 +135,6 @@ compound_assignment_subtract_64 (void)
 void
 compound_assignment_multiply_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b *= d32;  VERIFY (b == 5000);
@@ -158,7 +151,6 @@ compound_assignment_multiply_64 (void)
 void
 compound_assignment_divide_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a (1000), b;
 
   b = a; b /= d32;  VERIFY (b == 200);
@@ -175,7 +167,6 @@ compound_assignment_divide_64 (void)
 void
 compound_assignment_add_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b += d32;  VERIFY (b == 1005);
@@ -192,7 +183,6 @@ compound_assignment_add_128 (void)
 void
 compound_assignment_subtract_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b -= d32;  VERIFY (b == 995);
@@ -209,7 +199,6 @@ compound_assignment_subtract_128 (void)
 void
 compound_assignment_multiply_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b *= d32;  VERIFY (b == 5000);
@@ -226,7 +215,6 @@ compound_assignment_multiply_128 (void)
 void
 compound_assignment_divide_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a (1000), b;
 
   b = a; b /= d32;  VERIFY (b == 200);
diff --git a/libstdc++-v3/testsuite/decimal/conversion-from-float.cc b/libstdc++-v3/testsuite/decimal/conversion-from-float.cc
index b9a08d7..8e2ab87 100644
--- a/libstdc++-v3/testsuite/decimal/conversion-from-float.cc
+++ b/libstdc++-v3/testsuite/decimal/conversion-from-float.cc
@@ -29,7 +29,6 @@ using namespace std::decimal;
 void
 conversion_from_float_32 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d32(123);
   decimal64 d64(234);
   decimal128 d128(345);
@@ -52,7 +51,6 @@ conversion_from_float_32 ()
 void
 conversion_from_float_64 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d32(123);
   decimal64 d64(234);
   decimal128 d128(345);
@@ -75,7 +73,6 @@ conversion_from_float_64 ()
 void
 conversion_from_float_128 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d32(123);
   decimal64 d64(234);
   decimal128 d128(345);
diff --git a/libstdc++-v3/testsuite/decimal/conversion-from-integral.cc b/libstdc++-v3/testsuite/decimal/conversion-from-integral.cc
index 1c53595..9f11890 100644
--- a/libstdc++-v3/testsuite/decimal/conversion-from-integral.cc
+++ b/libstdc++-v3/testsuite/decimal/conversion-from-integral.cc
@@ -29,7 +29,6 @@ using namespace std::decimal;
 void
 conversion_from_integral_p32 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d;
   decimal32 from_si (1);
   decimal32 from_ui (2U);
@@ -62,7 +61,6 @@ conversion_from_integral_p32 ()
 void
 conversion_from_integral_m32 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d;
   decimal32 from_si (-1);
   decimal32 from_sl (-2L);
@@ -83,7 +81,6 @@ conversion_from_integral_m32 ()
 void
 conversion_from_integral_p64 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal64 d;
   decimal64 from_si (1);
   decimal64 from_ui (2U);
@@ -116,7 +113,6 @@ conversion_from_integral_p64 ()
 void
 conversion_from_integral_m64 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal64 d;
   decimal64 from_si (-1);
   decimal64 from_sl (-2L);
@@ -137,7 +133,6 @@ conversion_from_integral_m64 ()
 void
 conversion_from_integral_p128 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal128 d;
   decimal128 from_si (1);
   decimal128 from_ui (2U);
@@ -169,7 +164,6 @@ conversion_from_integral_p128 ()
 void
 conversion_from_integral_m128 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal128 d;
   decimal128 from_si (-1);
   decimal128 from_sl (-2L);
diff --git a/libstdc++-v3/testsuite/decimal/conversion-to-generic-float.cc b/libstdc++-v3/testsuite/decimal/conversion-to-generic-float.cc
index 8fa416e..afdd73a 100644
--- a/libstdc++-v3/testsuite/decimal/conversion-to-generic-float.cc
+++ b/libstdc++-v3/testsuite/decimal/conversion-to-generic-float.cc
@@ -27,7 +27,6 @@ using namespace std::decimal;
 void
 conversion_to_generic_float_32 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 d32(123);
   float f;
   double d;
@@ -52,7 +51,6 @@ conversion_to_generic_float_32 ()
 void
 conversion_to_generic_float_64 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal64 d64(234);
   float f;
   double d;
@@ -77,7 +75,6 @@ conversion_to_generic_float_64 ()
 void
 conversion_to_generic_float_128 ()
 {
-  bool test __attribute__((unused)) = true;
   decimal128 d128(345);
   float f;
   double d;
diff --git a/libstdc++-v3/testsuite/decimal/conversion-to-integral.cc b/libstdc++-v3/testsuite/decimal/conversion-to-integral.cc
index a7d6bf0..913b921 100644
--- a/libstdc++-v3/testsuite/decimal/conversion-to-integral.cc
+++ b/libstdc++-v3/testsuite/decimal/conversion-to-integral.cc
@@ -35,7 +35,6 @@ conversion_to_integral_32 (void)
 {
   #undef MAXVAL
   #define MAXVAL 999999LL
-  bool test __attribute__((unused)) = true;
   decimal32 a, b (1), c (-1), d (MAXVAL), e (-MAXVAL);
   long long ll;
 
@@ -51,7 +50,6 @@ conversion_to_integral_64 (void)
 {
   #undef MAXVAL
   #define MAXVAL 999999999999999LL
-  bool test __attribute__((unused)) = true;
   decimal64 a, b (1), c (-1), d (MAXVAL), e (-MAXVAL);
   long long ll;
 
@@ -67,7 +65,6 @@ conversion_to_integral_128 (void)
 {
   #undef MAXVAL
   #define MAXVAL LONG_LONG_MAX
-  bool test __attribute__((unused)) = true;
   decimal128 a, b (1), c (-1), d (MAXVAL), e (-MAXVAL);
   long long ll;
 
diff --git a/libstdc++-v3/testsuite/decimal/ctor.cc b/libstdc++-v3/testsuite/decimal/ctor.cc
index b289ed0..d873f26 100644
--- a/libstdc++-v3/testsuite/decimal/ctor.cc
+++ b/libstdc++-v3/testsuite/decimal/ctor.cc
@@ -33,7 +33,6 @@ using namespace std::decimal;
 void
 ctor_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
   float b __attribute__((mode(SD))) = 0.e-101DF;
 
@@ -43,7 +42,6 @@ ctor_32 (void)
 void
 ctor_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
   float b __attribute__((mode(DD))) = 0.e-398DD;
 
@@ -53,7 +51,6 @@ ctor_64 (void)
 void
 ctor_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
   float b __attribute__((mode(TD))) = 0.e-6176DL;
 
diff --git a/libstdc++-v3/testsuite/decimal/incdec-memfunc.cc b/libstdc++-v3/testsuite/decimal/incdec-memfunc.cc
index dd2efc2..36f9110 100644
--- a/libstdc++-v3/testsuite/decimal/incdec-memfunc.cc
+++ b/libstdc++-v3/testsuite/decimal/incdec-memfunc.cc
@@ -34,7 +34,6 @@ using namespace std::decimal;
 void
 incdec32 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal32 a(11), b, c;
 
@@ -82,7 +81,6 @@ incdec32 (void)
 void
 incdec64 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal64 a(11), b, c;
 
@@ -130,7 +128,6 @@ incdec64 (void)
 void
 incdec128 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal128 a(11), b, c;
 
diff --git a/libstdc++-v3/testsuite/decimal/incdec.cc b/libstdc++-v3/testsuite/decimal/incdec.cc
index 9196aa7..11c8140 100644
--- a/libstdc++-v3/testsuite/decimal/incdec.cc
+++ b/libstdc++-v3/testsuite/decimal/incdec.cc
@@ -32,7 +32,6 @@ using namespace std::decimal;
 void
 incdec32 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal32 a(11), b, c;
 
@@ -80,7 +79,6 @@ incdec32 (void)
 void
 incdec64 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal64 a(11), b, c;
 
@@ -128,7 +126,6 @@ incdec64 (void)
 void
 incdec128 (void)
 {
-  bool test __attribute__((unused)) = true;
   int ival;
   decimal128 a(11), b, c;
 
diff --git a/libstdc++-v3/testsuite/decimal/make-decimal.cc b/libstdc++-v3/testsuite/decimal/make-decimal.cc
index b5aafa2..1ed0ebe 100644
--- a/libstdc++-v3/testsuite/decimal/make-decimal.cc
+++ b/libstdc++-v3/testsuite/decimal/make-decimal.cc
@@ -55,7 +55,6 @@ using namespace std::decimal;
 void
 make_decimal_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a, b, c, d;
   float x __attribute__((mode(SD)));
   int i;
@@ -80,7 +79,6 @@ make_decimal_32 (void)
 void
 make_decimal_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a, b, c, d;
   float x __attribute__((mode(DD)));
   int i;
@@ -105,7 +103,6 @@ make_decimal_64 (void)
 void
 make_decimal_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a, b, c, d;
   float x __attribute__((mode(TD)));
   int i;
diff --git a/libstdc++-v3/testsuite/decimal/pr54036-1.cc b/libstdc++-v3/testsuite/decimal/pr54036-1.cc
index 3a74b97..9b6d604 100644
--- a/libstdc++-v3/testsuite/decimal/pr54036-1.cc
+++ b/libstdc++-v3/testsuite/decimal/pr54036-1.cc
@@ -44,7 +44,6 @@ my_inf32 (void)
 int
 main ()
 {
-  bool test __attribute__((unused)) = true;
   decimal32 v;
 
   v = my_nan32 ();
diff --git a/libstdc++-v3/testsuite/decimal/pr54036-2.cc b/libstdc++-v3/testsuite/decimal/pr54036-2.cc
index 8d036a2..158735b 100644
--- a/libstdc++-v3/testsuite/decimal/pr54036-2.cc
+++ b/libstdc++-v3/testsuite/decimal/pr54036-2.cc
@@ -44,7 +44,6 @@ my_inf64 (void)
 int
 main ()
 {
-  bool test __attribute__((unused)) = true;
   decimal64 v;
 
   v = my_nan64 ();
diff --git a/libstdc++-v3/testsuite/decimal/pr54036-3.cc b/libstdc++-v3/testsuite/decimal/pr54036-3.cc
index c370f70..36a0984 100644
--- a/libstdc++-v3/testsuite/decimal/pr54036-3.cc
+++ b/libstdc++-v3/testsuite/decimal/pr54036-3.cc
@@ -44,7 +44,6 @@ my_inf128 (void)
 int
 main ()
 {
-  bool test __attribute__((unused)) = true;
   decimal128 v;
 
   v = my_nan128 ();
diff --git a/libstdc++-v3/testsuite/decimal/unary-arith.cc b/libstdc++-v3/testsuite/decimal/unary-arith.cc
index d34ebd2..7029960 100644
--- a/libstdc++-v3/testsuite/decimal/unary-arith.cc
+++ b/libstdc++-v3/testsuite/decimal/unary-arith.cc
@@ -31,7 +31,6 @@ decimal128 a128 (5001), b128 (-5001);
 void
 unary_plus_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
 
   a = +a32; VERIFY (a == a32);
@@ -41,7 +40,6 @@ unary_plus_32 (void)
 void
 unary_minus_32 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal32 a;
 
   a = -a32; VERIFY (a == b32);
@@ -51,7 +49,6 @@ unary_minus_32 (void)
 void
 unary_plus_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
 
   a = +a64; VERIFY (a == a64);
@@ -61,7 +58,6 @@ unary_plus_64 (void)
 void
 unary_minus_64 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal64 a;
 
   a = -a64; VERIFY (a == b64);
@@ -71,7 +67,6 @@ unary_minus_64 (void)
 void
 unary_plus_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
 
   a = +a128; VERIFY (a == a128);
@@ -81,7 +76,6 @@ unary_plus_128 (void)
 void
 unary_minus_128 (void)
 {
-  bool test __attribute__((unused)) = true;
   decimal128 a;
 
   a = -a128; VERIFY (a == b128);
diff --git a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
index 60c6871..664502c 100644
--- a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
@@ -29,7 +29,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
   float xf = std::numeric_limits<float>::quiet_NaN();
   double xd = std::numeric_limits<double>::quiet_NaN();
   long double xl = std::numeric_limits<long double>::quiet_NaN();
diff --git a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_value.cc b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_value.cc
index d6a4f55..d38775d 100644
--- a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_value.cc
@@ -2026,7 +2026,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_assoc_laguerre<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
index ec916ff..e15c934 100644
--- a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::assoc_legendre(l, m, xl);
   long double e = std::assoc_legendrel(l, m, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_value.cc b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_value.cc
index 9028872..b7e975f 100644
--- a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_value.cc
@@ -1878,7 +1878,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_assoc_legendre<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc b/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
index 07ea9fa..e884518 100644
--- a/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::beta(xl, yl);
   long double e = std::betal(xl, yl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::beta(xl, yl);
   long double e = std::betal(xl, yl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/03_beta/check_value.cc b/libstdc++-v3/testsuite/special_functions/03_beta/check_value.cc
index 9334881..5c51603 100644
--- a/libstdc++-v3/testsuite/special_functions/03_beta/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/03_beta/check_value.cc
@@ -232,7 +232,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_beta<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
index 7d0eb0a..c8e5dc0 100644
--- a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
@@ -38,7 +38,6 @@ test01()
   long double d = std::comp_ellint_1(kl);
   long double e = std::comp_ellint_1l(kl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_value.cc b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_value.cc
index f9e9952..06de6fc 100644
--- a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_value.cc
@@ -70,7 +70,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_comp_ellint_1<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
index 72e1d10..80ff3bc 100644
--- a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
@@ -38,7 +38,6 @@ test01()
   long double d = std::comp_ellint_2(kl);
   long double e = std::comp_ellint_2l(kl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_value.cc b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_value.cc
index eda3012..85ae2826 100644
--- a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_value.cc
@@ -70,7 +70,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_comp_ellint_2<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
index 62be47d..f41022c 100644
--- a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::comp_ellint_3(kl, nul);
   long double e = std::comp_ellint_3l(kl, nul);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::comp_ellint_3(kl, nul);
   long double e = std::comp_ellint_3l(kl, nul);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_value.cc b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_value.cc
index 6ac640f..016cf48 100644
--- a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_value.cc
@@ -403,7 +403,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_comp_ellint_3<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
index 0bf0264..e7f515c 100644
--- a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::cyl_bessel_i(nul, xl);
   long double e = std::cyl_bessel_il(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::cyl_bessel_i(nul, xl);
   long double e = std::cyl_bessel_il(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_value.cc b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_value.cc
index 9231221..d958dba 100644
--- a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_value.cc
@@ -643,7 +643,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_cyl_bessel_i<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/pr56216.cc b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/pr56216.cc
index e4a2ef4..cb6d8e7 100644
--- a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/pr56216.cc
+++ b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/pr56216.cc
@@ -30,7 +30,6 @@ test01()
   double j1 = std::cyl_bessel_j(1.0, 0.0);
   double i1 = std::cyl_bessel_i(1.0, 0.0);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(j0 == 1.0);
   VERIFY(i0 == 1.0);
   VERIFY(j1 == 0.0);
diff --git a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
index 719dac9..07bab72 100644
--- a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::cyl_bessel_j(nul, xl);
   long double e = std::cyl_bessel_jl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::cyl_bessel_j(nul, xl);
   long double e = std::cyl_bessel_jl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_value.cc b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_value.cc
index 1c7c16a..d183ba9 100644
--- a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_value.cc
@@ -643,7 +643,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_cyl_bessel_j<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
index b58a6fb..5d32434 100644
--- a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::cyl_bessel_k(nul, xl);
   long double e = std::cyl_bessel_kl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::cyl_bessel_k(nul, xl);
   long double e = std::cyl_bessel_kl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_value.cc b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_value.cc
index b3607aa..0d9782a 100644
--- a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_value.cc
@@ -681,7 +681,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_cyl_bessel_k<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
index 487d82e..589f36e 100644
--- a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::cyl_neumann(nul, xl);
   long double e = std::cyl_neumannl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::cyl_neumann(nul, xl);
   long double e = std::cyl_neumannl(nul, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_value.cc b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_value.cc
index 03d6b82..c9f0cd5 100644
--- a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_value.cc
@@ -667,7 +667,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_cyl_neumann<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
index 7176020..5415134 100644
--- a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::ellint_1(kl, phil);
   long double e = std::ellint_1l(kl, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::ellint_1(kl, phil);
   long double e = std::ellint_1l(kl, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_value.cc b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_value.cc
index b2040c7..139323e 100644
--- a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_value.cc
@@ -403,7 +403,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_ellint_1<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
index 9b2eba0..a122e23 100644
--- a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
@@ -42,7 +42,6 @@ test01()
   long double d = std::ellint_2(kl, phil);
   long double e = std::ellint_2l(kl, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -69,7 +68,6 @@ test02()
   long double d = std::ellint_2(kl, phil);
   long double e = std::ellint_2l(kl, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_value.cc b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_value.cc
index b49a4cc..e936f27 100644
--- a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_value.cc
@@ -403,7 +403,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_ellint_2<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
index bdec59e..7d6977b 100644
--- a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
@@ -46,7 +46,6 @@ test01()
   long double d = std::ellint_3(kl, nul, phil);
   long double e = std::ellint_3l(kl, nul, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -77,7 +76,6 @@ test02()
   long double d = std::ellint_3(kl, nul, phil);
   long double e = std::ellint_3l(kl, nul, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
@@ -108,7 +106,6 @@ test03()
   long double d = std::ellint_3(kl, nul, phil);
   long double e = std::ellint_3l(kl, nul, phil);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_value.cc b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_value.cc
index d806d48..a7051d5 100644
--- a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_value.cc
@@ -5552,7 +5552,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_ellint_3<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc b/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
index 7c0c5e4..f7a228a 100644
--- a/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
@@ -38,7 +38,6 @@ test01()
   long double d = std::expint(xl);
   long double e = std::expintl(xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/14_expint/check_value.cc b/libstdc++-v3/testsuite/special_functions/14_expint/check_value.cc
index 5b3f8e0..4b276c9 100644
--- a/libstdc++-v3/testsuite/special_functions/14_expint/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/14_expint/check_value.cc
@@ -162,7 +162,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_expint<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc b/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
index cf5357e..4227b78 100644
--- a/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::hermite(n, xl);
   long double e = std::hermitel(n, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/15_hermite/check_value.cc b/libstdc++-v3/testsuite/special_functions/15_hermite/check_value.cc
index a805549..f71e0a6 100644
--- a/libstdc++-v3/testsuite/special_functions/15_hermite/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/15_hermite/check_value.cc
@@ -1722,7 +1722,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_hermite<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
index b73c3db..9c8cd69 100644
--- a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::laguerre(n, xl);
   long double e = std::laguerrel(n, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_value.cc b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_value.cc
index 3447ad8..bed4f9c 100644
--- a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_value.cc
@@ -282,7 +282,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_laguerre<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc b/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
index 26fa341..b45f2b3 100644
--- a/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
@@ -41,7 +41,6 @@ test01()
   long double d = std::legendre(l, xl);
   long double e = std::legendrel(l, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/17_legendre/check_value.cc b/libstdc++-v3/testsuite/special_functions/17_legendre/check_value.cc
index 626bdc9..34db45e 100644
--- a/libstdc++-v3/testsuite/special_functions/17_legendre/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/17_legendre/check_value.cc
@@ -282,7 +282,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_legendre<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
index 1e49e93..d795161 100644
--- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
@@ -38,7 +38,6 @@ test01()
   long double d = std::riemann_zeta(xl);
   long double e = std::riemann_zetal(xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
index 7ab4ea0..90b7dda 100644
--- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
@@ -273,7 +273,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_riemann_zeta<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
index dd99d66..50df77d 100644
--- a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::sph_bessel(n, xl);
   long double e = std::sph_bessell(n, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_value.cc b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_value.cc
index 38e6162..27b7633 100644
--- a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_value.cc
@@ -463,7 +463,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_sph_bessel<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
index 8e2558d..e96263b 100644
--- a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::sph_legendre(l, m, thetal);
   long double e = std::sph_legendrel(l, m, thetal);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_value.cc b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_value.cc
index 5e4344e..65594ef 100644
--- a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_value.cc
@@ -1878,7 +1878,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_sph_legendre<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
index 03bc643..51dbb78 100644
--- a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
@@ -40,7 +40,6 @@ test01()
   long double d = std::sph_neumann(n, xl);
   long double e = std::sph_neumannl(n, xl);
 
-  bool test [[gnu::unused]] = true;
   VERIFY(std::isnan(a));
   VERIFY(std::isnan(b));
   VERIFY(std::isnan(c));
diff --git a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_value.cc b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_value.cc
index 371501d..001fa53 100644
--- a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_value.cc
@@ -507,7 +507,6 @@ template<typename Tp, unsigned int Num>
   void
   test(const testcase_sph_neumann<Tp> (&data)[Num], Tp toler)
   {
-    bool test __attribute__((unused)) = true;
     const Tp eps = std::numeric_limits<Tp>::epsilon();
     Tp max_abs_diff = -Tp(1);
     Tp max_abs_frac = -Tp(1);
diff --git a/libstdc++-v3/testsuite/tr2/bases/value.cc b/libstdc++-v3/testsuite/tr2/bases/value.cc
index 60de61f..d4b6368 100644
--- a/libstdc++-v3/testsuite/tr2/bases/value.cc
+++ b/libstdc++-v3/testsuite/tr2/bases/value.cc
@@ -28,8 +28,6 @@ struct C : public B1, public B2 { };
 
 void test()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   {
     typedef std::tr2::bases<A>::type tl;
diff --git a/libstdc++-v3/testsuite/tr2/direct_bases/value.cc b/libstdc++-v3/testsuite/tr2/direct_bases/value.cc
index d03da6a..d464d87 100644
--- a/libstdc++-v3/testsuite/tr2/direct_bases/value.cc
+++ b/libstdc++-v3/testsuite/tr2/direct_bases/value.cc
@@ -28,8 +28,6 @@ struct C : public B1, public B2 { };
 
 void test()
 {
-  bool test __attribute__((unused)) = true;
-
   // 1
   {
     typedef std::tr2::direct_bases<A>::type tl;
diff --git a/libstdc++-v3/testsuite/util/debug/checks.h b/libstdc++-v3/testsuite/util/debug/checks.h
index 872fa1a..a079d46 100644
--- a/libstdc++-v3/testsuite/util/debug/checks.h
+++ b/libstdc++-v3/testsuite/util/debug/checks.h
@@ -88,8 +88,6 @@ namespace __gnu_test
     void
     check_assign1()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -118,8 +116,6 @@ namespace __gnu_test
     void
     check_assign2()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -147,8 +143,6 @@ namespace __gnu_test
     void
     check_assign3()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -176,8 +170,6 @@ namespace __gnu_test
     void
     check_construct1()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -201,8 +193,6 @@ namespace __gnu_test
     void
     check_construct2()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -226,8 +216,6 @@ namespace __gnu_test
     void
     check_construct3()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -300,8 +288,6 @@ namespace __gnu_test
     void
     check_insert1()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -329,8 +315,6 @@ namespace __gnu_test
     void
     check_insert2()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -358,8 +342,6 @@ namespace __gnu_test
     void
     check_insert3()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -387,8 +369,6 @@ namespace __gnu_test
     void
     check_insert4()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -414,8 +394,6 @@ namespace __gnu_test
   template<typename _Tp>
     void use_invalid_iterator()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
diff --git a/libstdc++-v3/testsuite/util/debug/unordered_checks.h b/libstdc++-v3/testsuite/util/debug/unordered_checks.h
index 5982c18..4b50742 100644
--- a/libstdc++-v3/testsuite/util/debug/unordered_checks.h
+++ b/libstdc++-v3/testsuite/util/debug/unordered_checks.h
@@ -79,8 +79,6 @@ namespace __gnu_test
   template<typename _Tp>
     void use_erased_local_iterator()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -106,8 +104,6 @@ namespace __gnu_test
   template<typename _Tp>
     void use_invalid_local_iterator()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -132,8 +128,6 @@ namespace __gnu_test
   template<typename _Tp>
     void invalid_local_iterator_compare()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
@@ -165,8 +159,6 @@ namespace __gnu_test
   template<typename _Tp>
     void invalid_local_iterator_range()
     {
-      bool test __attribute__((unused)) = true;
-
       typedef _Tp cont_type;
       typedef typename cont_type::value_type cont_val_type;
       typedef typename CopyableValueType<cont_val_type>::value_type val_type;
diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index dd7e22d..97b770b 100644
--- a/libstdc++-v3/testsuite/util/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
@@ -351,8 +351,6 @@ namespace __gnu_test
       void
       deallocate(pointer p, size_type n)
       {
-	bool test __attribute__((unused)) = true;
-
 	VERIFY( p );
 
 	map_type::iterator it = get_map().find(reinterpret_cast<void*>(p));
diff --git a/libstdc++-v3/testsuite/util/testsuite_api.h b/libstdc++-v3/testsuite/util/testsuite_api.h
index 2be2eee..6bc8d80 100644
--- a/libstdc++-v3/testsuite/util/testsuite_api.h
+++ b/libstdc++-v3/testsuite/util/testsuite_api.h
@@ -70,7 +70,6 @@ namespace __gnu_test
       // behavior is ambiguity.
       static void test()
       {
-	bool test __attribute__((unused)) = true;
 	try
 	  { throw error_type(); }
 	catch (std::exception const&)
diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
index 3233676..19c6adf 100644
--- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
+++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
@@ -842,7 +842,6 @@ namespace __gnu_test
 	    _Ttype __a(__v1);
 	    __v0 = __a;
 
-	    bool test __attribute__((unused)) = true;
 	    VERIFY( __v1 == __v0 );
 	  }
 	};
@@ -869,7 +868,6 @@ namespace __gnu_test
 	    __a = __v1;
 	    _Tvalue __vr = __a;
 
-	    bool test __attribute__((unused)) = true;
 	    VERIFY( __v1 == __vr );
 	  }
 	};
diff --git a/libstdc++-v3/testsuite/util/testsuite_random.h b/libstdc++-v3/testsuite/util/testsuite_random.h
index 578e94a..7d89efd 100644
--- a/libstdc++-v3/testsuite/util/testsuite_random.h
+++ b/libstdc++-v3/testsuite/util/testsuite_random.h
@@ -39,7 +39,6 @@ namespace __gnu_test
     void
     testDiscreteDist(Distribution& f, Pdf pdf)
     {
-      bool test __attribute__((unused)) = true;
       double count[BINS], p[BINS];
 
       for (unsigned long i = 0; i < BINS; i++)
diff --git a/libstdc++-v3/testsuite/util/testsuite_rvalref.h b/libstdc++-v3/testsuite/util/testsuite_rvalref.h
index b577459..d84a906 100644
--- a/libstdc++-v3/testsuite/util/testsuite_rvalref.h
+++ b/libstdc++-v3/testsuite/util/testsuite_rvalref.h
@@ -53,7 +53,6 @@ namespace __gnu_test
 
     rvalstruct(rvalstruct&& in)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( in.valid == true );
       val = in.val;
       in.valid = false;
@@ -66,7 +65,6 @@ namespace __gnu_test
     rvalstruct&
     operator=(rvalstruct&& in)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( this != &in );
       VERIFY( in.valid == true );
       val = in.val;
@@ -87,7 +85,6 @@ namespace __gnu_test
   void
   swap(rvalstruct& lhs, rvalstruct& rhs)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( lhs.valid && rhs.valid );
     int temp = lhs.val;
     lhs.val = rhs.val;
@@ -112,14 +109,12 @@ namespace __gnu_test
 
     copycounter(const copycounter& in) : val(in.val), valid(true)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( in.valid == true );
       ++copycount;
     }
 
     copycounter(copycounter&& in) noexcept
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( in.valid == true );
       val = in.val;
       in.valid = false;
@@ -137,7 +132,6 @@ namespace __gnu_test
     bool
     operator=(const copycounter& in)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( in.valid == true );
       ++copycount;
       val = in.val;
@@ -148,7 +142,6 @@ namespace __gnu_test
     copycounter&
     operator=(copycounter&& in)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY(in.valid == true);
       val = in.val;
       in.valid = false;
@@ -173,7 +166,6 @@ namespace __gnu_test
   inline void
   swap(copycounter& lhs, copycounter& rhs)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( lhs.valid && rhs.valid );
     int temp = lhs.val;
     lhs.val = rhs.val;
@@ -192,14 +184,12 @@ namespace __gnu_test
     rvalstruct_compare_by_value(const rvalstruct_compare_by_value& rh)
     : val(rh.val), ok(rh.ok)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY(rh.ok);
     }
 
     rvalstruct_compare_by_value&
     operator=(const rvalstruct_compare_by_value& rh)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( rh.ok );
       val = rh.val;
       ok = rh.ok;
@@ -209,7 +199,6 @@ namespace __gnu_test
     rvalstruct_compare_by_value(rvalstruct_compare_by_value&& rh)
     : val(rh.val), ok(rh.ok)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( rh.ok );
       rh.ok = false;
     }
@@ -217,7 +206,6 @@ namespace __gnu_test
     rvalstruct_compare_by_value&
     operator=(rvalstruct_compare_by_value&& rh)
     {
-      bool test __attribute__((unused)) = true;
       VERIFY( rh.ok );
       val = rh.val;
       ok = rh.ok;
@@ -230,7 +218,6 @@ namespace __gnu_test
   operator<(rvalstruct_compare_by_value lh,
 	    rvalstruct_compare_by_value rh)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( rh.ok );
     VERIFY( lh.ok );
     return lh.val < rh.val;
@@ -240,7 +227,6 @@ namespace __gnu_test
   order(rvalstruct_compare_by_value lh,
 	rvalstruct_compare_by_value rh)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( rh.ok );
     VERIFY( lh.ok );
     return lh.val < rh.val;
-- 
2.7.4