12790-1.cc: Remove 'test' variables.

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

	* testsuite/27_io/basic_filebuf/close/12790-1.cc: Remove 'test'
        variables.
	* testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/char/5.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_filebuf/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/12206.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13007.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc: Likewise.
	* testsuite/27_io/basic_filebuf/in_avail/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/is_open/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/3599.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/9169.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/char/9988.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/10132-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/45628-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/11543.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/12232.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc:
	Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/10132-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc: Likewise.
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc:
	Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
	* testsuite/27_io/basic_filebuf/setbuf/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/setbuf/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sgetn/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/snextc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/59427.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/59427.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/9339.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sync/char/1057.cc: Likewise.
	* testsuite/27_io/basic_filebuf/sync/char/9182-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/45841.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/char/9027.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc: Likewise.
	* testsuite/27_io/basic_fstream/cons/1.cc: Likewise.
	* testsuite/27_io/basic_fstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_ifstream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_ios/clear/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ios/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/cons/char/2.cc: Likewise.
	* testsuite/27_io/basic_ios/cons/char/3.cc: Likewise.
	* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise.
	* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
	* testsuite/27_io/basic_ios/imbue/14072.cc: Likewise.
	* testsuite/27_io/basic_ios/locales/char/1.cc: Likewise.
	* testsuite/27_io/basic_iostream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_istream/cons/3.cc: Likewise.
	* testsuite/27_io/basic_istream/exceptions/char/9561.cc: Likewise.
	* testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
	exceptions_failbit.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/
	wchar_t/9555-ia.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
	dr696.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
	exceptions_failbit.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/1.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/2.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/3.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/4.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/
	11095-i.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/wchar_t/
	9555-ic.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/26181.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/
	error_failbit.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/char/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	error_failbit.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_istream/get/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/get/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/get/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/get/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/get/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/get/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/4.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/5.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/char/6.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/5.cc: Likewise.
	* testsuite/27_io/basic_istream/getline/wchar_t/6.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/6360.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/char/7220.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc: Likewise.
	* testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/char/12296.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/char/6414.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/wchar_t/12296.cc: Likewise.
	* testsuite/27_io/basic_istream/peek/wchar_t/6414.cc: Likewise.
	* testsuite/27_io/basic_istream/putback/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/putback/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/read/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/read/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/read/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/read/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/read/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/read/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/char/6746-1.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/char/6746-2.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/char/8258.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc: Likewise.
	* testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/8348-1.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/8348-2.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/fstream.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/char/sstream.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc: Likewise.
	* testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/char/3.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/pod/1.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/sentry/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/2.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/8348.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/fstream.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/char/sstream.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc: Likewise.
	* testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc: Likewise.
	* testsuite/27_io/basic_istream/ws/char/1.cc: Likewise.
	* testsuite/27_io/basic_istream/ws/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_istringstream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc: Likewise.
	* testsuite/27_io/basic_istringstream/str/char/1.cc: Likewise.
	* testsuite/27_io/basic_istringstream/str/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ofstream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ofstream/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise.
	* testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_ostream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ostream/cons/char/9827.cc: Likewise.
	* testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc: Likewise.
	* testsuite/27_io/basic_ostream/endl/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/endl/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/ends/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/ends/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/ends/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise.
	* testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc: Likewise.
	* testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/flush/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/flush/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/flush/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/flush/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
	9555-oa.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/3.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/4.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/5.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/6.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/8.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	11095-od.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	11095-oe.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	11095-of.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	28277-1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	28277-2.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	28277-3.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	28277-4.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
	9555-oc.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/3.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/4.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/5.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/
	error_failbit.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	9318-out.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	9424-out.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	9555-oo.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	error_code.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	error_failbit.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	exceptions_failbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
	exceptions_null.cc: Likewise.
	* testsuite/27_io/basic_ostream/put/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/put/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc: Likewise.
	* testsuite/27_io/basic_ostream/seekp/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/char/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/tellp/wchar_t/
	exceptions_badbit_throw.cc: Likewise.
	* testsuite/27_io/basic_ostream/write/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/write/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/cons/char/3.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/str/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/str/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_streambuf/cons/57394.cc: Likewise.
	* testsuite/27_io/basic_streambuf/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc: Likewise.
	* testsuite/27_io/basic_streambuf/in_avail/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/char/2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/char/3599.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sync/char/1057.cc: Likewise.
	* testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/cons/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/imbue/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/in_avail/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/char/26250.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/char/3599.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/char/9988.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/char/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/char/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/char/4.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sgetc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sgetn/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/snextc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/char/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/char/3955.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sungetc/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sync/char/1057.cc: Likewise.
	* testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc: Likewise.
	* testsuite/27_io/basic_stringstream/cons/2020.cc: Likewise.
	* testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc: Likewise.
	* testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/char/1.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/char/2.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/char/3.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/char/4.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/wchar_t/1.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_stringstream/str/wchar_t/4.cc: Likewise.
	* testsuite/27_io/fpos/11450.cc: Likewise.
	* testsuite/27_io/fpos/14252.cc: Likewise.
	* testsuite/27_io/fpos/14320-1.cc: Likewise.
	* testsuite/27_io/fpos/14320-2.cc: Likewise.
	* testsuite/27_io/fpos/14320-3.cc: Likewise.
	* testsuite/27_io/fpos/14320-4.cc: Likewise.
	* testsuite/27_io/fpos/14320-5.cc: Likewise.
	* testsuite/27_io/fpos/14775.cc: Likewise.
	* testsuite/27_io/fpos/mbstate_t/1.cc: Likewise.
	* testsuite/27_io/fpos/mbstate_t/12065.cc: Likewise.
	* testsuite/27_io/fpos/mbstate_t/2.cc: Likewise.
	* testsuite/27_io/fpos/mbstate_t/3.cc: Likewise.
	* testsuite/27_io/ios_base/callbacks/1.cc: Likewise.
	* testsuite/27_io/ios_base/failure/what-1.cc: Likewise.
	* testsuite/27_io/ios_base/failure/what-2.cc: Likewise.
	* testsuite/27_io/ios_base/failure/what-3.cc: Likewise.
	* testsuite/27_io/ios_base/failure/what-big.cc: Likewise.
	* testsuite/27_io/ios_base/state/1.cc: Likewise.
	* testsuite/27_io/ios_base/storage/1.cc: Likewise.
	* testsuite/27_io/ios_base/storage/11584.cc: Likewise.
	* testsuite/27_io/ios_base/storage/2.cc: Likewise.
	* testsuite/27_io/ios_base/sync_with_stdio/2.cc: Likewise.
	* testsuite/27_io/manipulators/adjustfield/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/adjustfield/char/2.cc
	* testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc: Likewise.
	* testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc: Likewise.
	* testsuite/27_io/manipulators/basefield/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/basefield/wchar_t/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/get_money/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/get_money/char/51288.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/get_time/char/1.cc
	* testsuite/27_io/manipulators/extended/get_time/char/2.cc: Likewise.
	* testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: Likewise.
	* testsuite/27_io/manipulators/extended/put_money/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/put_money/char/51288.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc:
	Likewise.
	* testsuite/27_io/manipulators/extended/put_time/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/put_time/char/2.cc: Likewise.
	* testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc: Likewise.
	* testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: Likewise.
	* testsuite/27_io/manipulators/standard/char/1.cc: Likewise.
	* testsuite/27_io/manipulators/standard/char/2.cc: Likewise.
	* testsuite/27_io/manipulators/standard/char/dr2344.cc: Likewise.
	* testsuite/27_io/manipulators/standard/char/quoted.cc: Likewise.
	* testsuite/27_io/manipulators/standard/wchar_t/1.cc: Likewise.
	* testsuite/27_io/manipulators/standard/wchar_t/2.cc: Likewise.
	* testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc: Likewise.
	* testsuite/27_io/manipulators/standard/wchar_t/quoted.cc: Likewise.
	* testsuite/27_io/objects/char/1.cc: Likewise.
	* testsuite/27_io/objects/char/10.cc: Likewise.
	* testsuite/27_io/objects/char/3045.cc: Likewise.
	* testsuite/27_io/objects/char/41037.cc: Likewise.
	* testsuite/27_io/objects/char/5.cc: Likewise.
	* testsuite/27_io/objects/char/6.cc: Likewise.
	* testsuite/27_io/objects/char/6548_xin.cc: Likewise.
	* testsuite/27_io/objects/char/6648-1_xin.cc: Likewise.
	* testsuite/27_io/objects/char/6648-2_xin.cc: Likewise.
	* testsuite/27_io/objects/char/7744_xin.cc: Likewise.
	* testsuite/27_io/objects/char/8.cc: Likewise.
	* testsuite/27_io/objects/char/9.cc: Likewise.
	* testsuite/27_io/objects/char/9661-2_xin.cc: Likewise.
	* testsuite/27_io/objects/char/dr455.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/1.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/10.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/11.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/12.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/13.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/13582-1_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/3045.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/41037.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/5.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/6548_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/6648-1_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/6648-2_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/7744_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/8.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/9520.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/9661-2_xin.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/9662.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/dr455.cc: Likewise.
	* testsuite/27_io/types/3.cc: Likewise.

From-SVN: r241283

708 files changed, 1009 insertions, 1149 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 37ecc9c..0339477 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,855 @@
+2016-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/27_io/basic_filebuf/close/12790-1.cc: Remove 'test'
+        variables.
+	* testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/char/5.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/12206.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/13007.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/in_avail/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/is_open/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/char/4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/3599.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/9169.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/char/9988.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/10132-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/45628-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/11543.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/12232.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc:
+	Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/10132-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc:
+	Likewise.
+	* testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
+	* testsuite/27_io/basic_filebuf/setbuf/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/setbuf/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sgetn/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/snextc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/59427.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/59427.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/9339.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sync/char/1057.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/sync/char/9182-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/char/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/char/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/char/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/char/45841.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/char/9027.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc: Likewise.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc: Likewise.
+	* testsuite/27_io/basic_fstream/cons/1.cc: Likewise.
+	* testsuite/27_io/basic_fstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_ifstream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_ios/clear/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ios/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_ios/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ios/cons/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ios/cons/char/3.cc: Likewise.
+	* testsuite/27_io/basic_ios/copyfmt/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ios/imbue/14072.cc: Likewise.
+	* testsuite/27_io/basic_ios/locales/char/1.cc: Likewise.
+	* testsuite/27_io/basic_iostream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_istream/cons/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/exceptions/char/9561.cc: Likewise.
+	* testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
+	exceptions_failbit.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/char/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/
+	wchar_t/9555-ia.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
+	dr696.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
+	exceptions_failbit.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/1.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/3.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/4.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/
+	11095-i.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_character/wchar_t/
+	9555-ic.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/26181.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/
+	error_failbit.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/char/
+	exceptions_null.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc:
+	Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
+	error_failbit.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/extractors_other/wchar_t/
+	exceptions_null.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/get/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/4.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/5.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/char/6.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/5.cc: Likewise.
+	* testsuite/27_io/basic_istream/getline/wchar_t/6.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/char/6360.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/char/7220.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc: Likewise.
+	* testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/char/12296.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/char/6414.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/wchar_t/12296.cc: Likewise.
+	* testsuite/27_io/basic_istream/peek/wchar_t/6414.cc: Likewise.
+	* testsuite/27_io/basic_istream/putback/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/putback/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/read/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/char/6746-1.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/char/6746-2.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/char/8258.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc: Likewise.
+	* testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/26211.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/8348-1.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/8348-2.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/fstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/char/sstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/char/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/pod/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/sentry/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/8348.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/fstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/char/sstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc: Likewise.
+	* testsuite/27_io/basic_istream/ws/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istream/ws/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/str/char/1.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ofstream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_ofstream/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_ostream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_ostream/cons/char/9827.cc: Likewise.
+	* testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc: Likewise.
+	* testsuite/27_io/basic_ostream/endl/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/endl/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/ends/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/ends/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/ends/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise.
+	* testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc: Likewise.
+	* testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/flush/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/flush/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/flush/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/flush/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
+	9555-oa.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/3.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/4.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/5.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/6.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/8.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	11095-od.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	11095-oe.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	11095-of.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	28277-1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	28277-2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	28277-3.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	28277-4.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/
+	9555-oc.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/3.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/4.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/5.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc:
+	Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/
+	error_failbit.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/char/
+	exceptions_null.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	9318-out.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	9424-out.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	9555-oo.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	error_code.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	error_failbit.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	exceptions_failbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/
+	exceptions_null.cc: Likewise.
+	* testsuite/27_io/basic_ostream/put/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/put/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc: Likewise.
+	* testsuite/27_io/basic_ostream/seekp/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/sentry/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/sentry/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/char/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_ostream/tellp/wchar_t/
+	exceptions_badbit_throw.cc: Likewise.
+	* testsuite/27_io/basic_ostream/write/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostream/write/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/cons/char/3.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/str/char/1.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/str/char/2.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/cons/57394.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/in_avail/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/char/2.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/char/3599.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sync/char/1057.cc: Likewise.
+	* testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/cons/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/imbue/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/in_avail/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/char/26250.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/char/3599.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/char/9988.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/char/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/char/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/char/4.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sgetc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sgetn/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/snextc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputn/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/char/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/char/3955.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sungetc/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sync/char/1057.cc: Likewise.
+	* testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/cons/2020.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/char/1.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/char/2.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/char/3.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/char/4.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/3.cc: Likewise.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/4.cc: Likewise.
+	* testsuite/27_io/fpos/11450.cc: Likewise.
+	* testsuite/27_io/fpos/14252.cc: Likewise.
+	* testsuite/27_io/fpos/14320-1.cc: Likewise.
+	* testsuite/27_io/fpos/14320-2.cc: Likewise.
+	* testsuite/27_io/fpos/14320-3.cc: Likewise.
+	* testsuite/27_io/fpos/14320-4.cc: Likewise.
+	* testsuite/27_io/fpos/14320-5.cc: Likewise.
+	* testsuite/27_io/fpos/14775.cc: Likewise.
+	* testsuite/27_io/fpos/mbstate_t/1.cc: Likewise.
+	* testsuite/27_io/fpos/mbstate_t/12065.cc: Likewise.
+	* testsuite/27_io/fpos/mbstate_t/2.cc: Likewise.
+	* testsuite/27_io/fpos/mbstate_t/3.cc: Likewise.
+	* testsuite/27_io/ios_base/callbacks/1.cc: Likewise.
+	* testsuite/27_io/ios_base/failure/what-1.cc: Likewise.
+	* testsuite/27_io/ios_base/failure/what-2.cc: Likewise.
+	* testsuite/27_io/ios_base/failure/what-3.cc: Likewise.
+	* testsuite/27_io/ios_base/failure/what-big.cc: Likewise.
+	* testsuite/27_io/ios_base/state/1.cc: Likewise.
+	* testsuite/27_io/ios_base/storage/1.cc: Likewise.
+	* testsuite/27_io/ios_base/storage/11584.cc: Likewise.
+	* testsuite/27_io/ios_base/storage/2.cc: Likewise.
+	* testsuite/27_io/ios_base/sync_with_stdio/2.cc: Likewise.
+	* testsuite/27_io/manipulators/adjustfield/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/adjustfield/char/2.cc
+	* testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/manipulators/basefield/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/basefield/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/get_money/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/get_money/char/51288.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/get_time/char/1.cc
+	* testsuite/27_io/manipulators/extended/get_time/char/2.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/put_money/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/put_money/char/51288.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc:
+	Likewise.
+	* testsuite/27_io/manipulators/extended/put_time/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/put_time/char/2.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/char/1.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/char/2.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/char/dr2344.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/char/quoted.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/wchar_t/2.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc: Likewise.
+	* testsuite/27_io/manipulators/standard/wchar_t/quoted.cc: Likewise.
+	* testsuite/27_io/objects/char/1.cc: Likewise.
+	* testsuite/27_io/objects/char/10.cc: Likewise.
+	* testsuite/27_io/objects/char/3045.cc: Likewise.
+	* testsuite/27_io/objects/char/41037.cc: Likewise.
+	* testsuite/27_io/objects/char/5.cc: Likewise.
+	* testsuite/27_io/objects/char/6.cc: Likewise.
+	* testsuite/27_io/objects/char/6548_xin.cc: Likewise.
+	* testsuite/27_io/objects/char/6648-1_xin.cc: Likewise.
+	* testsuite/27_io/objects/char/6648-2_xin.cc: Likewise.
+	* testsuite/27_io/objects/char/7744_xin.cc: Likewise.
+	* testsuite/27_io/objects/char/8.cc: Likewise.
+	* testsuite/27_io/objects/char/9.cc: Likewise.
+	* testsuite/27_io/objects/char/9661-2_xin.cc: Likewise.
+	* testsuite/27_io/objects/char/dr455.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/10.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/11.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/12.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/13.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/13582-1_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/3045.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/41037.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/5.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/6548_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/6648-1_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/6648-2_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/7744_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/8.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/9520.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/9661-2_xin.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/9662.cc: Likewise.
+	* testsuite/27_io/objects/wchar_t/dr455.cc: Likewise.
+	* testsuite/27_io/types/3.cc: Likewise.
+
 2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/77994
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/12790-1.cc
index 54852e9..b9b0cb9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/12790-1.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc
index 34bc728..575313f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc
@@ -33,7 +33,6 @@ const char name_02[] = "filebuf_members-1.txt";
 // Test member functions.
 void test_01() 
 {
-  bool test __attribute__((unused)) = true;
   const char* name_03 = "filebuf_members-3"; // empty file, need to create
 
   std::filebuf fb_01; // in 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-1.cc
index 5ea9cf4..89a6740 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-1.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-2.cc
index 334159d..0234193 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-2.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc
index bbe8b5d..bcdaefa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-4.cc
index 95287c3..0318816 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-4.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc
index c65f5c6..eb6dd9b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc
@@ -43,7 +43,6 @@ const char name_02[] = "filebuf_virtuals-2.txt"; // empty file, need to create
 
 void test_02()
 {
-  bool test __attribute__((unused)) = true;
   int close_num = 0;
 
   // read (ext)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc
index 2ea8e52..fd094d5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc
@@ -64,7 +64,6 @@ void test05()
   typedef std::filebuf::off_type 	off_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   std::filebuf 				f_tmp;
 
   fb_01.open(name_01, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc
index ab9c151..b8af596 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc
@@ -35,8 +35,6 @@ void test_04()
 {
   typedef std::filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   std::filebuf fb_01, fb_02;
   char buffer[] = "xxxxxxxxxx";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc
index 24e208a..ff5e13d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc
@@ -57,8 +57,6 @@ public:
 
 void test_05()
 {
-  bool test __attribute__((unused)) = true;
-
   Close_filebuf fb_01, fb_02;
   char buffer[] = "xxxxxxxxxx";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc
index c3ce8bb..efc9a8c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc
index cf98c34..25d4086 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc
index ef9b975..0f94190 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc
index e88e18a..8c79d9b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_close_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/2020.cc
index d9823a8..985b381 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/2020.cc
@@ -28,7 +28,7 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf;
   
   try
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/char/1.cc
index efd5aeb..0629888 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/char/1.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-09/msg00243.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::constraint_filebuf fbuf;
   VERIFY( fbuf.check_pointers() );
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc
index 2b46c10..5840001 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/1.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-09/msg00243.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::constraint_wfilebuf fbuf;
   VERIFY( fbuf.check_pointers() );
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc
index 34a7d4d..df1822a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/cons/wchar_t/10132-1.cc
@@ -32,8 +32,6 @@ protected:
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc = std::locale(std::locale::classic(), new Cvt);
   std::wfilebuf* fb = new std::wfilebuf;
   fb->pubimbue(loc);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/12206.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/12206.cc
index ea25b31..2d2b2de 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/12206.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/12206.cc
@@ -95,8 +95,7 @@ namespace std
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
-  
+ 
   locale loc(locale::classic(),
 	     new codecvt<Char, char, std::mbstate_t>);
   locale::global(loc);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc
index b420df1..3c8a387 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc
@@ -43,8 +43,6 @@ protected:
 // libstdc++/13007
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf buf;
   std::locale loc(std::locale(ISO_8859(15,fr_FR)));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc
index 7d6aaf8..6135b01 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc
@@ -26,7 +26,6 @@
 // libstdc++/13171
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc
index 39c4f7e..3ffed53 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc
@@ -37,7 +37,6 @@ protected:
 // libstdc++/13171
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc
index 302d1af..40fcbbd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc
@@ -37,7 +37,6 @@
 // libstdc++/13582
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std; 
   using namespace __gnu_test;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
index 584d16d..d6ba911 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
@@ -40,7 +40,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   Buf fb;
   locale loc_us = locale(ISO_8859(1,en_US));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
index 9975193..cf7b925 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
@@ -28,7 +28,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
   locale loc;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/3.cc
index 7706867..e431473 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/3.cc
@@ -34,7 +34,6 @@ protected:
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc_s(locale::classic(), new state_codecvt);
   filebuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
index 269ba3d..8328bca 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
@@ -30,7 +30,6 @@
 void test07()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc;
   std::filebuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc
index cfed79a..3b87ef9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc
@@ -29,7 +29,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc_is(locale("is_IS.UTF-8"));
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc
index 3d32b83..545b1f8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc
@@ -43,8 +43,6 @@ protected:
 // libstdc++/13007
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf buf;
   std::locale loc(std::locale(ISO_8859(15,fr_FR)));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc
index c6843c4..ab7a6f4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc
@@ -28,7 +28,6 @@
 // libstdc++/13171
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   locale::global(locale(ISO_8859(15,fr_FR)));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc
index d1ffb2a..1e4dc43 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc
@@ -37,7 +37,6 @@
 // libstdc++/13582
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   using namespace __gnu_test;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
index 89e4602..b1b5f77 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
@@ -29,7 +29,6 @@
 // libstdc++/13582
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   locale loc_en(locale(ISO_8859(1,en_US)));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
index 8c38a3b..97e7817 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
@@ -28,7 +28,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
   locale loc;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc
index d03726d..71368b6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/3.cc
@@ -34,7 +34,6 @@ protected:
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc_s(locale::classic(), new state_codecvt);
   wfilebuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
index ba8048e..795fb4f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
@@ -30,7 +30,6 @@
 void test07()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc;
   std::wfilebuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc
index 211b219..5872c9f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc
@@ -66,7 +66,6 @@ void test05()
   typedef std::filebuf::off_type 	off_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   std::filebuf 				f_tmp;
   std::streamoff  			strmof_1, strmof_2;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc
index f90930f..f7fb685 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/9701-3.cc
@@ -36,7 +36,6 @@ public:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_file1";
 
   Derived_fbuf df2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc
index 52f7c9a..899cc49 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc
@@ -33,7 +33,6 @@ const char name_02[] = "filebuf_members-1.txt";
 // Test member functions.
 void test_01() 
 {
-  bool test __attribute__((unused)) = true;
   const char* name_03 = "filebuf_members-3"; // empty file, need to create
 
   std::filebuf fb_01; // in 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/12790-1.cc
index ea6b343..5b2b925 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/12790-1.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_open_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc
index 0b9eea8..8d621fc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc
@@ -33,7 +33,6 @@ const char name_02[] = "filebuf_members-1.txt";
 // Test member functions.
 void test_01() 
 {
-  bool test __attribute__((unused)) = true;
   const char* name_03 = "filebuf_members-3"; // empty file, need to create
 
   std::filebuf fb_01; // in 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc
index d663e61..7f104d3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc
@@ -37,7 +37,6 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 void test_03()
 {
-  bool test __attribute__((unused)) = true;
   int first_fd = ::open(name_01, O_RDONLY);
   VERIFY( first_fd != -1 );
   FILE* first_file = ::fdopen(first_fd, "r");
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
index 37c2b0f..4e88b89 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/3.cc
@@ -30,7 +30,6 @@
 // Charles Leggett <CGLeggett@lbl.gov>
 void test_05()
 {
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_file5";
 
   std::fstream scratch_file;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc
index 852c629..1cda2e5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/4.cc
@@ -25,7 +25,6 @@
 // DR 596.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_file4";
 
   std::fstream scratch_file;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
index cbf3228..7686bec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc
@@ -36,7 +36,6 @@
 void test_06()
 {
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_fifo2";
 
   signal(SIGPIPE, SIG_IGN);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/1.cc
index 515874c..84052f6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/1.cc
@@ -49,7 +49,6 @@ template<typename T>
 
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
   const std::string control01("11111");
   std::string test01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
index ceac920..1c461c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2-unbuf.cc
@@ -37,7 +37,6 @@ public:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   typedef OverBuf::traits_type  traits_type;
 
   OverBuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
index a0b5562..a941321 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/2.cc
@@ -37,7 +37,6 @@ public:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   typedef OverBuf::traits_type  traits_type;
 
   OverBuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/3599.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/3599.cc
index 0f849a4..70da6b1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/3599.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/3599.cc
@@ -39,7 +39,6 @@ protected:
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   testbuf ob;
   std::ostream out(&ob); 
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
index a0a8e8c..1455fce 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
@@ -40,7 +40,6 @@ class Cvt_to_upper : public std::codecvt<char, char, mbstate_t>
 void test10()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale c_loc = locale::classic();
   locale loc(c_loc, new Cvt_to_upper);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
index 3deb81b..1e137b7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
@@ -52,7 +52,6 @@ protected:
 void test14()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc =  locale::classic();
   loc = locale(loc, new errorcvt);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9988.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9988.cc
index b8149e2..41015f6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9988.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9988.cc
@@ -38,7 +38,6 @@ public:
 void test15()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   OverBuf fb;
   fb.open(name_08, ios_base::out | ios_base::trunc);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc
index 1056e33..866f4f7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
   locale loc(locale("en_US.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc
index 816e603..8986f4a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc
@@ -26,7 +26,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
   locale loc(locale("en_US.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc
index fa0cbf75..6c529ea 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc
@@ -26,7 +26,6 @@
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
   locale loc(locale("en_US.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc
index 11953ac..6f2e7ce 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc
@@ -26,7 +26,6 @@
 void test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
   locale loc(locale("en_US.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
index 01300a4..3a1cb04 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
@@ -30,7 +30,6 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbuf;
   filebuf::int_type r1, r2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc
index 215b301..504e7e2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc
@@ -37,8 +37,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc
index f942a5b..f17a22a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc
@@ -38,8 +38,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
index b7cf510..0f5d817 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc
@@ -35,8 +35,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc
index dfbf70b..f295c20 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc
@@ -37,8 +37,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc
index 039fbdd..13f51da 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc
@@ -38,8 +38,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
index ab6f1d1..a5cfa6a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc
@@ -35,8 +35,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   // int_type sbumpc()
   // if read_cur not avail returns uflow(), else return *read_cur & increment
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc
index beb82fd..4fa2d1c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/9825.cc
@@ -31,7 +31,6 @@ const char name_06[] = "filebuf_virtuals-6.txt"; // empty file, need to create
 void test12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbuf;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc
index 8e70e85..b765035 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc
@@ -27,7 +27,6 @@
 // libstdc++/10132, add on
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf;
   
   try
@@ -37,9 +36,8 @@ void test07()
       obj.pubseekoff(2, std::ios_base::beg);
     }
   catch(std::exception& obj)
-    { 
-      test = false; 
-      VERIFY( test );
+    {
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-1.cc
index 9d5dee2..7d347b7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-1.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-2.cc
index 7b4ea09..e9192e1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-2.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-3.cc
index 1b411ab..90ad943 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-3.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc
index 970bac2..8e20ddf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/45628-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/45628-2.cc
index 6dd2eeb..44b13df 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/45628-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/45628-2.cc
@@ -45,8 +45,6 @@ class my_filebuf
 // libstdc++/45628
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::pod_uchar;
   std::locale loc(std::locale::classic(),
 	     new std::codecvt<my_filebuf::traits_type::char_type, char,
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
index 2984489..ae3278d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc
index a44799b..0a2fc34 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
index 6bb0e2e..60ceab3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/11543.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/11543.cc
index 523770c..4bb51f8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/11543.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/11543.cc
@@ -132,8 +132,6 @@ namespace std
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc(std::locale::classic(),
 		  new std::codecvt<char, char, MyState>);
   std::basic_filebuf<char, MyCharTraits> fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12232.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12232.cc
index b4b0afa..9e2cf03 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12232.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12232.cc
@@ -26,7 +26,6 @@ const char name[] = "tmp_12232";
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open(name, ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc
index fa2d41a..e490e2b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc
index 64e6cca..05376b5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc
index e2f435d..c168c2d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc
@@ -57,7 +57,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc
index 1b6256b..cb021c0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
index ef9985d..b2b26f9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc
index bc8cb57..b0b4150 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
index 0093903..d58ec91 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   int_type c1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
index 0e7fab2..4732aa15 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
index f16e27a..11ba91e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc
index abb1dee..023e266 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-out.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4.cc
index 5fe6f95..f740592 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/4.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef filebuf::pos_type pos_type;
   const char name[] = "tmp_seekoff-4.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc
index 2bb14be..b67c0e0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/45628-1.cc
@@ -44,8 +44,6 @@ class my_filebuf
 // libstdc++/45628
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   my_filebuf q;
   q.open(name_01, std::ios_base::in | std::ios_base::out 
 	 | std::ios_base::trunc); 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
index 7f53a1c..3ed42c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
@@ -33,7 +33,6 @@ void test01()
   typedef wfilebuf::pos_type pos_type;
   typedef wfilebuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_seekoff-1.tst";
   const int_type eof = wfilebuf::traits_type::eof();
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc
index 4941c8f..0dec62d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc
@@ -120,8 +120,6 @@ namespace std
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc(std::locale::classic(),
 		  new std::codecvt<wchar_t, char, MyState>);
   std::basic_filebuf<wchar_t, MyCharTraits> fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc
index afec7c1..00bfd23 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc
index 5757a6a..ba11940 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc
index ddc7c771..92b18af 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc
@@ -55,7 +55,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc
index 6abdb63..cc200c5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekoff_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
index fb60539..c2c4926 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
@@ -32,7 +32,6 @@ void test02()
 {
   using namespace std;
   typedef wfilebuf::int_type int_type;
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_seekoff-2.tst";
 
   locale loc = locale("se_NO.UTF-8");
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc
index ca6ca4e..502cc4c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc
@@ -23,7 +23,6 @@
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char* name = "tmp_seekoff_3";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
index c69e02d..2f5adf4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/4.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef wfilebuf::pos_type pos_type;
   const char name[] = "tmp_seekoff-4.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
index ea3481e..882372f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
@@ -78,7 +78,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   // seekoff
   wfilebuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc
index 239e68e..f5f0782 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc
@@ -27,7 +27,6 @@
 // libstdc++/10132, add on
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf;
   
   try
@@ -38,8 +37,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-1.cc
index 646fd1f..e89572e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-1.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-2.cc
index 20e87cf..d462a12 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-2.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-3.cc
index c1bd01b..01a6827 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/12790-3.cc
@@ -31,7 +31,6 @@ void test01()
   using __gnu_test::pod_uchar;
   typedef basic_filebuf<pod_uchar>::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   locale loc(locale::classic(),
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc
index 3fcbf87..32f68bd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc
@@ -40,8 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc
index 9afb0c3..b9d4c57 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc
@@ -39,8 +39,6 @@ void test05()
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc
index 4169b33..943f84e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc
@@ -40,8 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc
index 06ff4d2..bba6f03 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc
index 1d7b833..836233d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc
index 2ecda34..1c20a51 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc
@@ -55,7 +55,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc
index 8ff3b54..574bd37 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc
@@ -56,7 +56,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc
index 87a15e9..4b4758c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc
@@ -40,8 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc
index 1f14b98..1504efd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc
@@ -39,8 +39,6 @@ void test05()
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc
index c27d0c9..7e96b1f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc
@@ -40,8 +40,6 @@ void test05()
   typedef filebuf::off_type 	off_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   int_type c1;
   int_type c2;
   int_type c3;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
index bd25b61..ca9972d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
index 474983d..e587175 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc
index a88bf3e..4e789f6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-out.cc
@@ -26,7 +26,6 @@
 
 void test02(std::filebuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc
index 39f72f6..13bb2d1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char* name = "tmp_seekpos_1";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc
index 873c77c..c5a7a61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc
index 30431be..f101a1f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc
index b3e20c8..1f8f142 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc
@@ -55,7 +55,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc
index bcc4078..beddf9c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc
@@ -54,7 +54,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_seekpos_12790";
 
   Cvt* cvt = new Cvt;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
index 87ad93d..42c2c05 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
@@ -35,7 +35,6 @@ void test01()
   typedef wfilebuf::int_type int_type;
   typedef vector<pair<pos_type, size_t> > vec_type;
 
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_seekpos-9874.tst";
   const int_type eof = wfilebuf::traits_type::eof();
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
index c00eba0..1d18fdb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
@@ -78,7 +78,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   // seekpos
   wfilebuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
index c200196..89bb0f2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
@@ -39,7 +39,7 @@ public:
   bool
   check_pointers()
   { 
-    bool test __attribute__((unused)) = true;
+    bool test = true;
     test = (!this->pbase());
     test &= (!this->pptr());
     return test;
@@ -58,8 +58,6 @@ void test05()
   typedef std::filebuf::off_type 	off_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
-
   {
     testbuf 				f_tmp;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc
index 8eac38b..9b2b8b5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-1.cc
@@ -28,7 +28,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char* name = "tmp_setbuf4";
   static char buf[1024];
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
index 0a0d65d..2ef8431 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc
@@ -28,7 +28,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char* name = "tmp_setbuf5";
   static char buf[1024];
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/2.cc
index 5089d5b..f34f556 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/2.cc
@@ -29,7 +29,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::strlen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/3.cc
index 64a0ca7..d5180f9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/3.cc
@@ -29,7 +29,6 @@ void test03()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::strlen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc
index ee374a5..9c7e486 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc
@@ -38,7 +38,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc
index b9b80bc..45d857d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc
@@ -39,7 +39,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
index f6b63e1..b9881e7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc
@@ -38,7 +38,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc
index e3b0cfb..f993739 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc
@@ -38,7 +38,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc
index 7092ddf..5eaf353 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc
@@ -39,7 +39,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
index baec058..8256b25 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc
@@ -36,7 +36,6 @@ void test05()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sgetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
index a209360..98beb9d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
@@ -43,8 +43,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray1[13] = "";
   char carray2[8192] = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
index 0a24369..89e2bc7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
@@ -44,8 +44,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray1[13] = "";
   char carray2[8192] = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
index 8e8f17d..66f0ece 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
@@ -36,8 +36,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray2[8192] = "";
   int_type 			c2, c4;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
index 49ed2c7..044bdb7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
@@ -43,8 +43,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray1[13] = "";
   char carray2[8192] = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
index 5b8839b..a928b7c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
@@ -44,8 +44,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray1[13] = "";
   char carray2[8192] = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
index 9ec1cf4..c482731 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc
@@ -36,8 +36,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
-
   streamsize 			strmsz_1, strmsz_2;
   char carray2[8192] = "";
   int_type 			c2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
index fc5117d..16d7b0c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
@@ -30,7 +30,6 @@ void test06()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   char buffer[] = "xxxxxxxxxx";
   typedef filebuf::int_type	int_type;
   filebuf fbuf01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc
index 5c40cad..fcfcd027 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-1.cc
@@ -34,7 +34,6 @@ void test_01()
 {
   using namespace std;
   using namespace __gnu_test;
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_fifo1";
 
   const int count = 10000;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc
index 6b61da1..646f4bb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/showmanyc/char/9533-2.cc
@@ -24,7 +24,6 @@
 void test_02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;  
   const char* name = "tmp_file1";
   const char* strlit = "0123456789";
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc
index 2e6add2..356dc73 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc
index 0e08b26..8efb68f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c3;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc
index 8e7ed51..a173cd3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc
@@ -37,7 +37,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c2;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc
index 9e975bd..91890f4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc
@@ -37,7 +37,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc
index c2edfe0..1804104 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc
@@ -38,7 +38,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c3;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
index a6d647d..756d4ec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc
@@ -35,7 +35,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c2;
 
   // int_type snextc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc
index 63e93c7..a97bc78 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sputbackc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
index 6fd414f..62f84bc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc
@@ -39,7 +39,6 @@ void test01()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
   int_type 			c1, c2, c3;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
index 93e5969..45ead84 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputbackc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc
index d456624..a31778a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2, c3;
 
   // int_type sputbackc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
index 5cfbd7c..a5a6087 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc
@@ -39,7 +39,6 @@ void test01()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
   int_type 			c1, c2, c3;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
index 154389c..888f2b9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputbackc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc
index b89fce2..97b3dd2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/9425.cc
@@ -32,7 +32,6 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 void test09()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbuf;
   fbuf.open(name_01, ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
index 6526a29..0db6a29 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
@@ -36,7 +36,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c3;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
index 23e9d22..604e654 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
index 0f764b3..dbacc85 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
@@ -38,7 +38,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
index bcc9c2a..0e2e09b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
@@ -36,7 +36,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c3;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
index 5799c6a..b9e938d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
index fa99007..def88ce 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
@@ -38,7 +38,6 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sputc(char_type c)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc
index f194fb6..5652dc1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc
@@ -23,7 +23,6 @@
 // libstdc++/59427
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf a_f;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
index 2c7e3d0..595b0ec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
@@ -45,8 +45,6 @@ public:
 // libstdc++/9701 (partial)
 void test11()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
 
   // sputc
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc
index 33ec6cf..fddb680 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc
@@ -37,7 +37,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc
index aacdf5f..d1e305d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
index d82e633..dd9488e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc
index c46a2d3..4aec814 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc
@@ -37,7 +37,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
index 72599a8..a4ab4cb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc
@@ -40,7 +40,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
index 368a0c6..217b8e3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc
@@ -39,7 +39,6 @@ void test05()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1;
 
   // streamsize sputn(const char_typs* s, streamsize n)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc
index ef3d9ab..54685f0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc
@@ -23,7 +23,6 @@
 // libstdc++/59427
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf a_f;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9339.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9339.cc
index 3c3421e..59dc2bc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9339.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9339.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbuf01;
   int len = 35;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc
index 6b5fc40..5888a2b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/9701-1.cc
@@ -49,8 +49,6 @@ public:
 // libstdc++/9701 (partial)
 void test11()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
 
   // sputn
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc
index f6380fe..c8429aa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			        c1, c2, c3;
 
   // int_type sungetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
index 149e426..8c3b326 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc
@@ -39,7 +39,6 @@ void test01()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 		size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
   int_type 			c1, c2;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
index 94dcfbe..6ff702e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc
@@ -36,7 +36,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sungetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc
index 9dfc6e0..0af8d24 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc
@@ -38,7 +38,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			        c1, c2, c3;
 
   // int_type sungetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
index f99fe7d..2df1d8e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc
@@ -39,7 +39,6 @@ void test01()
   typedef filebuf::traits_type 	traits_type;
   typedef size_t 		size_type;
 
-  bool test __attribute__((unused)) = true;
   streamsize 			strmsz_1, strmsz_2;
   int_type 			c1, c2;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
index 8525760..41819de 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc
@@ -36,7 +36,6 @@ void test01()
   typedef std::filebuf::int_type 	int_type;
   typedef filebuf::traits_type 		traits_type;
 
-  bool test __attribute__((unused)) = true;
   int_type 			c1, c2;
 
   // int_type sungetc()
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/1057.cc
index 29c79ff..c491070 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/1057.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/1057.cc
@@ -71,7 +71,6 @@ public:
 // libstdc++/1057
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   std::string text = "abcdefghijklmn";
   
   // 01
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
index c8637f8..de60cff 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
@@ -52,7 +52,6 @@ protected:
 void test13()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc =  locale::classic();
   loc = locale(loc, new errorcvt);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/1.cc
index 5e8d555..18894f7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/1.cc
@@ -46,7 +46,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char* name = "filebuf_virtuals-1.txt";
 
   string str;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/2.cc
index 15e7b04..9c21b4a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/2.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf fb_out, fb_in_out;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/3.cc
index b6bae16..c476fd8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/3.cc
@@ -56,7 +56,6 @@ protected:
 // See Novell Bug 255122
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const char* name = "tmp_underflow_3.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/45841.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/45841.cc
index 951cc95..5b3837f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/45841.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/45841.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   filebuf fb_in_out;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/9027.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/9027.cc
index 65b2c13..06ed5bd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/9027.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/9027.cc
@@ -61,7 +61,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "filebuf_virtuals-1.txt";
   locale loc (locale::classic(), new Cvt_to_upper);	
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
index e99bc52..717d1da 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
@@ -30,7 +30,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_underflow-1.tst";
 
   const char cstr[] =
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
index 4eaf498..c580e8d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
@@ -27,7 +27,6 @@ const char name_01[] = "tmp_11389-1";
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open(name_01, ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
index 522789b..13bc42f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
@@ -27,7 +27,6 @@ const char name_02[] = "tmp_11389-2";
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open(name_02, ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
index a7182bd..8df4d60 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
@@ -27,7 +27,6 @@ const char name_03[] = "tmp_11389-3";
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open(name_03, ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
index de2b0bb..92913c7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
@@ -27,7 +27,6 @@ const char name_04[] = "tmp_11389-4";
 void test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open(name_04, ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
index 8a568b4..729d34a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
@@ -154,7 +154,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new checksumcvt<wchar_t>);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
index 1e418df..32e15e7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
@@ -154,7 +154,6 @@ protected:
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new checksumcvt<wchar_t>);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc
index 8c70679..a0046a9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc
@@ -166,7 +166,6 @@ public:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   filebuf fbout;
   fbout.open("tmp_11603", ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
index 0418f24..bba8384 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
@@ -30,7 +30,6 @@
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_underflow-2.tst";
 
   const char cstr[] =
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
index 209641d..0dfeb59 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
@@ -30,7 +30,6 @@
 void test03()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char name[] = "tmp_underflow-3.tst";
 
   const char cstr[] =
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
index 1d3a6ed..4579b7d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   locale loc (locale("se_NO.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc
index 3ea22ca..36e3345 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/45841.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   wfilebuf fb_in_out;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
index 45ad3da..63050f8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
@@ -30,7 +30,6 @@
 void test05()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_underflow-5";
 
   wfilebuf fb;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
index b11fc3d..e7b3d92 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
@@ -161,7 +161,6 @@ protected:
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc;
   loc = locale(loc, new checksumcvt<wchar_t>);
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
index f08db54..6b7f9e5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
@@ -28,7 +28,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_9520";
 
   FILE* file = fopen(name, "w");
diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/1.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/1.cc
index 4979ebf..90699a1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/1.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_fstream<__gnu_test::pod_ushort> gnu_fstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/rdbuf/char/2832.cc
index 9234355..f73b9df 100644
--- a/libstdc++-v3/testsuite/27_io/basic_fstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_fstream/rdbuf/char/2832.cc
@@ -33,7 +33,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/2020.cc
index 2884fe4..b0109cc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_ifstream<__gnu_test::pod_ushort> gnu_ifstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc
index 4682bff..70e48e5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc
@@ -30,7 +30,6 @@ const char name_01[] = "ifstream_members-1.tst";
 // http://gcc.gnu.org/ml/libstdc++/2000-07/msg00004.html
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const int more_than_max_open_files = 8200;
   
   for (int i = 0; ++i < more_than_max_open_files;)
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc
index 55513c8..55d8a3d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc
@@ -30,7 +30,6 @@ const char name_01[] = "ifstream_members-1.tst";
 // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::ifstream ifs1;
   ifs1.close();
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc
index 8c41c5c..0550ca2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc
@@ -37,7 +37,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc
index f054635..df86f28 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/clear/char/1.cc
@@ -27,8 +27,6 @@
 // 27.4.4.3 basic_ios iostate flags function
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::ios_base::fmtflags fmtflags;
   typedef std::ios_base::iostate iostate;
   using std::ios_base;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ios/cons/2020.cc
index b76202a..73085c1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/cons/2020.cc
@@ -31,14 +31,11 @@ class gnu_ios: public std::basic_ios<__gnu_test::pod_ushort>
 
 void test07()
 {
-  bool test __attribute__((unused)) = true;
-  
   try
     { gnu_ios obj; }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/1.cc
index a5778ba..f32375b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::string str_01("jade cove, big sur");
   std::string str_05;
   std::stringbuf strb_01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/2.cc
index f93ac5d..37f4b7c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/2.cc
@@ -30,7 +30,7 @@ class gnu_ios: public std::basic_ios<char> { };
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   // 01: Doesn't call basic_ios::init, which uses ctype<char_type>..
   // This should be unambiguously correct.
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
index 8973841..eadf905 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
@@ -118,7 +118,7 @@ namespace std
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
 
   // 02: Calls basic_ios::init, which may call ctype<char_type>...
   try
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc
index df4cf43..8df6ba4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc
@@ -29,8 +29,6 @@
 // 27.4.4.3 basic_ios iostate flags function
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::ios_base::fmtflags fmtflags;
   typedef std::ios_base::iostate iostate;
   using std::ios_base;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc
index 459afe3..794b495 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc
@@ -29,8 +29,6 @@
 // copyfmt and locales.
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace std;
 
   typedef std::ios_base::fmtflags fmtflags;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc
index c2357fc..6db11e7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::ios_base::fmtflags fmtflags;
   typedef std::ios_base::iostate iostate;
   using std::ios_base;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
index 69a4dbd..d668377 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
@@ -29,7 +29,6 @@
 // libstdc++/14072
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   locale loc;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc
index 865cf07..f399a60 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/locales/char/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const std::locale c_loc = std::locale::classic();
 
   std::ios ios_01(0);
diff --git a/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc
index f2ad5f7..2a278e7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_iostream/cons/2020.cc
@@ -27,7 +27,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_iostream<__gnu_test::pod_ushort> gnu_iostr;
 
   try
@@ -36,8 +35,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc
index a6cf734..efc9a64 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/cons/3.cc
@@ -28,15 +28,13 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_istream<__gnu_test::pod_ushort> gnu_istr;
 
   try
     { gnu_istr obj(0); }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/char/9561.cc b/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/char/9561.cc
index eb7f05d..7901be3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/char/9561.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/char/9561.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   __gnu_test::fail_streambuf b;
   std::istream strm (&b);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc b/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc
index 4f79d46..01684ba 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/exceptions/wchar_t/9561.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   __gnu_test::fail_wstreambuf b;
   std::wistream strm (&b);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
index 65b4558..1e3367a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc
@@ -42,9 +42,7 @@ std::istream is_04(&isbuf_04);
 std::stringstream ss_01(str_01);
  
 // minimal sanity check
-bool test01() {
-
-  bool test __attribute__((unused)) = true;
+void test01() {
 
   // Integral Types:
   bool 			b1  = false;
@@ -99,9 +97,9 @@ bool test01() {
   VERIFY( f1 == 1.5 );
 
   is_04 >> std::hex >> i1;
-  std::printf ("%d %d %d\n", i1, i1 == 0x123, test);
+  std::printf ("%d %d\n", i1, i1 == 0x123);
   VERIFY( i1 == 0x123 );
-  std::printf ("%d %d %d\n", i1, i1 == 0x123, test);
+  std::printf ("%d %d\n", i1, i1 == 0x123);
 
   // test void pointers
   int i = 55;
@@ -112,7 +110,6 @@ bool test01() {
   ss_01 >> pi;
   std::printf ("%p %p\n", pi, po);
   VERIFY( po == pi );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
index e174f0d..77d39cf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/02.cc
@@ -25,9 +25,8 @@
 #include <testsuite_hooks.h>
  
 // elaborated test for ints
-bool test02()
+void test02()
 {
-  bool test __attribute__((unused)) = true;
   const std::string str_01("20000AB");
   std::stringbuf strb_01(str_01, std::ios_base::in);
   std::istream is(&strb_01);
@@ -37,7 +36,6 @@ bool test02()
   VERIFY( n == 20000 );
   char c = is.peek();
   VERIFY( c == 65 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
index e6395a4..42d4bc7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/03.cc
@@ -24,19 +24,17 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test03()
+void test03()
 {
   std::stringbuf sbuf;
   std::istream istr(&sbuf);
   std::ostream ostr(&sbuf);
 
-  bool test __attribute__((unused)) = true;
   long l01;
   ostr << "12220101";
   istr >> l01; // _M_in_end set completely incorrectly here.
   VERIFY( l01 == 12220101 );
   VERIFY( istr.rdstate() == std::ios_base::eofbit );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
index f384307..a769356 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/06.cc
@@ -29,7 +29,6 @@
 void test06()
 {
   // default locale, grouping is turned off
-  bool test __attribute__((unused)) = true;
   unsigned int h4;
   char c;
   std::string s("205,199,144");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
index 2edd181..c32bc45 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/07.cc
@@ -37,7 +37,6 @@ namespace std {
 void test07()
 {
   // manufactured locale, grouping is turned on
-  bool test __attribute__((unused)) = true;
   unsigned int h4 = 0, h3 = 0, h2 = 0;
   float f1 = 0.0;
   const std::string s1("205,199 23,445.25 1,024,365 123,22,24");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
index 33e7865..ec0c9a3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/08.cc
@@ -37,7 +37,6 @@ namespace std {
 void test08()
 {
   // manufactured locale, grouping is turned on
-  bool test __attribute__((unused)) = true;
   unsigned int h4 = 0, h3 = 0, h2 = 0;
   const std::string s1("1,22 205,19 22,123,22");
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
index 0d989f4..21e5b24 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/09.cc
@@ -26,10 +26,8 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test09()
+void test09()
 {
-  bool test __attribute__((unused)) = true;
-
   std::string st("2.456e3-+0.567e-2");
   std::stringbuf sb(st);
   std::istream is(&sb);
@@ -38,10 +36,9 @@ bool test09()
   (is>>std::ws) >> f1;
   (is>>std::ws) >> c;
   (is>>std::ws) >> f2;
-  test = f1 == 2456;
+  VERIFY( f1 == 2456 );
   VERIFY( f2 == 0.00567 );
   VERIFY( c == '-' );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
index fd14677..0448115 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/10.cc
@@ -24,14 +24,12 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test10()
+void test10()
 {
   std::string str_01("0 00 000 +0 +0 -0");
   std::stringbuf isbuf_01(str_01);
   std::istream is_01(&isbuf_01);
 
-  bool test __attribute__((unused)) = true;
-
   int n = 365;
   is_01 >> n;
   VERIFY( n == 0 );
@@ -123,7 +121,6 @@ bool test10()
   is_05.ignore();
   is_05 >> n;
   VERIFY( n == 16 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
index f7f1526..fe0184e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/11.cc
@@ -28,9 +28,8 @@
 // In the presence of no fmtflags, the input operator should behave
 // like strtol(x, y, 0)
 // libstdc++/90
-bool test11()
+void test11()
 {
-  bool test __attribute__((unused)) = true;
   const char* cstrlit = "0x2a";
 
   // sanity check via 'C' library call
@@ -44,8 +43,6 @@ bool test11()
 
   VERIFY (!iss.fail());
   VERIFY (l == i);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
index 792dbcb..8ce21fd2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc
@@ -29,10 +29,8 @@
 // libstdc++/3720
 // excess input should not cause a core dump
 template<typename T>
-bool test12_aux(bool integer_type)
+void test12_aux(bool integer_type)
 {
-  bool test __attribute__((unused)) = true;
-  
   int digits_overflow;
   if (integer_type)
     // This many digits will overflow integer types in base 10.
@@ -50,19 +48,16 @@ bool test12_aux(bool integer_type)
   T t;
   is >> t;
   VERIFY(is.fail());
-  return test;
 }
 
 bool test12()
 {
-  bool test __attribute__((unused)) = true;
-  VERIFY(test12_aux<short>(true));
-  VERIFY(test12_aux<int>(true));
-  VERIFY(test12_aux<long>(true));
-  VERIFY(test12_aux<float>(false));
-  VERIFY(test12_aux<double>(false));
-  VERIFY(test12_aux<long double>(false));
-  return test;
+  test12_aux<short>(true);
+  test12_aux<int>(true);
+  test12_aux<long>(true);
+  test12_aux<float>(false);
+  test12_aux<double>(false);
+  test12_aux<long double>(false);
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
index 5b7b433..0394c00 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc
@@ -29,7 +29,6 @@
 void test13()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const char* l2 = "1.2345678901234567890123456789012345678901234567890123456"
                    "  "
                    "1246.9";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc
index 0684c45..765d23d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/9555-ia.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::istream is(&b);
   is.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc
index 00e6cb1..365948f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/dr696.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   short s1 = 0;
   ostringstream oss1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc
index 7e50635..3378309 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_badbit_throw.cc
@@ -27,7 +27,6 @@ template<typename T>
 void test_badbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_get_char);
   istringstream stream("jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc
index 91e2fea..7b31ec6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc
@@ -26,7 +26,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   istringstream stream("jaylib - champion sound");
   stream.exceptions(ios_base::failbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit_throw.cc
index b64cefb..7b0defb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_get_char);
   istringstream stream("jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
index 32d4d79..d9dceef 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
@@ -37,8 +37,6 @@ void test03()
   stringbuf_type strbuf01;
   istream_type iss(&strbuf01);
 
-  bool test __attribute__((unused)) = true;
-
   try 
     { 
       int i;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc
index e763490..4bea061 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/01.cc
@@ -40,9 +40,7 @@ std::wistream is_04(&isbuf_04);
 std::wstringstream ss_01(str_01);
  
 // minimal sanity check
-bool test01() {
-
-  bool test __attribute__((unused)) = true;
+void test01() {
 
   // Integral Types:
   bool 			b1  = false;
@@ -97,9 +95,9 @@ bool test01() {
   VERIFY( f1 == 1.5 );
 
   is_04 >> std::hex >> i1;
-  std::printf ("%d %d %d\n", i1, i1 == 0x123, test);
+  std::printf ("%d %d\n", i1, i1 == 0x123);
   VERIFY( i1 == 0x123 );
-  std::printf ("%d %d %d\n", i1, i1 == 0x123, test);
+  std::printf ("%d %d\n", i1, i1 == 0x123);
 
   // test void pointers
   int i = 55;
@@ -110,7 +108,6 @@ bool test01() {
   ss_01 >> pi;
   std::printf ("%p %p\n", pi, po);
   VERIFY( po == pi );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc
index de50937..ac1283c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/02.cc
@@ -23,9 +23,8 @@
 #include <testsuite_hooks.h>
  
 // elaborated test for ints
-bool test02()
+void test02()
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01(L"20000AB");
   std::wstringbuf strb_01(str_01, std::ios_base::in);
   std::wistream is(&strb_01);
@@ -35,7 +34,6 @@ bool test02()
   VERIFY( n == 20000 );
   wchar_t c = is.peek();
   VERIFY( c == L'A' );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc
index 9fe30c0..3da90c3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/03.cc
@@ -22,19 +22,17 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test03()
+void test03()
 {
   std::wstringbuf sbuf;
   std::wistream istr(&sbuf);
   std::wostream ostr(&sbuf);
 
-  bool test __attribute__((unused)) = true;
   long l01;
   ostr << L"12220101";
   istr >> l01; // _M_in_end set completely incorrectly here.
   VERIFY( l01 == 12220101 );
   VERIFY( istr.rdstate() == std::ios_base::eofbit );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc
index 41c7fd6..4852a76 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/06.cc
@@ -27,7 +27,6 @@
 void test06()
 {
   // default locale, grouping is turned off
-  bool test __attribute__((unused)) = true;
   unsigned int h4;
   wchar_t c;
   std::wstring s(L"205,199,144");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc
index 169f2ae..395ee4e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/07.cc
@@ -35,7 +35,6 @@ namespace std {
 void test07()
 {
   // manufactured locale, grouping is turned on
-  bool test __attribute__((unused)) = true;
   unsigned int h4 = 0, h3 = 0, h2 = 0;
   float f1 = 0.0;
   const std::wstring s1(L"205,199 23,445.25 1,024,365 123,22,24");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc
index b0bb1be..912c823 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/08.cc
@@ -35,7 +35,6 @@ namespace std {
 void test08()
 {
   // manufactured locale, grouping is turned on
-  bool test __attribute__((unused)) = true;
   unsigned int h4 = 0, h3 = 0, h2 = 0;
   const std::wstring s1(L"1,22 205,19 22,123,22");
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc
index 979bb34..c6d72bb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/09.cc
@@ -24,10 +24,8 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test09()
+void test09()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstring st(L"2.456e3-+0.567e-2");
   std::wstringbuf sb(st);
   std::wistream is(&sb);
@@ -36,10 +34,9 @@ bool test09()
   (is >> std::ws) >> f1;
   (is >> std::ws) >> c;
   (is >> std::ws) >> f2;
-  test = f1 == 2456;
+  VERIFY( f1 == 2456 );
   VERIFY( f2 == 0.00567 );
   VERIFY( c == L'-' );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc
index 614e9de..c6052640 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/10.cc
@@ -22,14 +22,12 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-bool test10()
+void test10()
 {
   std::wstring str_01(L"0 00 000 +0 +0 -0");
   std::wstringbuf isbuf_01(str_01);
   std::wistream is_01(&isbuf_01);
 
-  bool test __attribute__((unused)) = true;
-
   int n = 365;
   is_01 >> n;
   VERIFY( n == 0 );
@@ -121,7 +119,6 @@ bool test10()
   is_05.ignore();
   is_05 >> n;
   VERIFY( n == 16 );
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc
index 833a862..ebe47c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/11.cc
@@ -26,9 +26,8 @@
 // In the presence of no fmtflags, the input operator should behave
 // like strtol(x, y, 0)
 // libstdc++/90
-bool test11()
+void test11()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* cstrlit = L"0x2a";
 
   // sanity check via 'C' library call
@@ -42,8 +41,6 @@ bool test11()
 
   VERIFY( !iss.fail() );
   VERIFY( l == i );
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc
index 1bb2159..ec6a998 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc
@@ -27,10 +27,8 @@
 // libstdc++/3720
 // excess input should not cause a core dump
 template<typename T>
-bool test12_aux(bool integer_type)
+void test12_aux(bool integer_type)
 {
-  bool test __attribute__((unused)) = true;
-  
   int digits_overflow;
   if (integer_type)
     // This many digits will overflow integer types in base 10.
@@ -48,19 +46,16 @@ bool test12_aux(bool integer_type)
   T t;
   is >> t;
   VERIFY( is.fail() );
-  return test;
 }
 
-bool test12()
+void test12()
 {
-  bool test __attribute__((unused)) = true;
-  VERIFY( test12_aux<short>(true) );
-  VERIFY( test12_aux<int>(true) );
-  VERIFY( test12_aux<long>(true) );
-  VERIFY( test12_aux<float>(false) );
-  VERIFY( test12_aux<double>(false) );
-  VERIFY( test12_aux<long double>(false) );
-  return test;
+  test12_aux<short>(true);
+  test12_aux<int>(true);
+  test12_aux<long>(true);
+  test12_aux<float>(false);
+  test12_aux<double>(false);
+  test12_aux<long double>(false);
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc
index a93f81c..3ae3edd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/13.cc
@@ -27,7 +27,6 @@
 void test13()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   const wchar_t* l2 = L"1.2345678901234567890123456789012345678901234567890123456"
                       L"  "
                       L"1246.9";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc
index 8d66a48..eb3158d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/9555-ia.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wistream is(&b);
   is.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/dr696.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/dr696.cc
index 8158c71..65a7ef4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/dr696.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/dr696.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   short s1 = 0;
   wostringstream oss1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc
index 16c34b7..3a9c280 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_badbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_badbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_get_wchar_t);
   wistringstream stream(L"jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc
index 088b2ca..d9e721a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc
@@ -26,7 +26,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wistringstream stream(L"jaylib - champion sound");
   stream.exceptions(ios_base::failbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit_throw.cc
index 9c8acf6..ad32a98 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_get_wchar_t);
   wistringstream stream(L"jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc
index abfd2a9..daa4629 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/1.cc
@@ -25,7 +25,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   std::string str_01;
   const std::string str_02("coltrane playing 'softly as a morning sunrise'");
   const std::string str_03("coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc
index fbeac88..f90d957 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/11095-i.cc
@@ -27,7 +27,6 @@
 // operator>>(basic_istream&, _CharT*)
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   const std::string str_01("Consoli ");
 
   std::stringbuf isbuf_01(str_01, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc
index 4868853d..77e4bbc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/2.cc
@@ -27,7 +27,6 @@ void test02()
 {
   typedef std::ios::traits_type ctraits_type;
 
-  bool test __attribute__((unused)) = true;
   std::string str_01;
   const std::string str_02("or coltrane playing tunji with jimmy garrison");
   const std::string str_03("coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc
index f9da61f..90b12fb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/3.cc
@@ -25,7 +25,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   std::string str_01;
   const std::string str_02("coltrane playing 'softly as a morning sunrise'");
   const std::string str_03("coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/4.cc
index bdb8785..f6517d0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/4.cc
@@ -45,8 +45,6 @@ string prepare(string::size_type len, unsigned nchunks)
 
 void check(istream& stream, const string& str, unsigned nchunks)
 {
-  bool test __attribute__((unused)) = true;
-
   char* chunk = new char[str.size()];
   memset(chunk, 'X', str.size());
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc
index 2232a66..4b6dc74 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9555-ic.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::istream is(&b);
   is.exceptions(std::ios::badbit);
@@ -45,8 +44,7 @@ void testthrow(T arg)
       }
   catch(...) 
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }    
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
index d84650b..9562c81 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
@@ -38,8 +38,6 @@ void test03()
   stringbuf_type strbuf01;
   istream_type iss(&strbuf01);
 
-  bool test __attribute__((unused)) = true;
-
   // input streams
   pod_ushort arr[6] = { { value_type('a') }, { value_type('b') }, 
 			{ value_type('c') }, { value_type('d') },
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc
index a3f1e25..451bbbf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/1.cc
@@ -23,7 +23,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str_01;
   const std::wstring str_02(L"coltrane playing 'softly as a morning sunrise'");
   const std::wstring str_03(L"coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/11095-i.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/11095-i.cc
index 25e8e09..2f70387 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/11095-i.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/11095-i.cc
@@ -25,7 +25,6 @@
 // operator>>(basic_istream&, _CharT*)
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01(L"Consoli ");
 
   std::wstringbuf isbuf_01(str_01, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc
index 7c90606..744b697 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/2.cc
@@ -23,7 +23,6 @@
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str_01;
   const std::wstring str_02(L"or coltrane playing tunji with jimmy garrison");
   const std::wstring str_03(L"coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc
index 41ba45e..90dc751 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/3.cc
@@ -23,7 +23,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str_01;
   const std::wstring str_02(L"coltrane playing 'softly as a morning sunrise'");
   const std::wstring str_03(L"coltrane");
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc
index 1740628..76b12c5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc
@@ -48,8 +48,6 @@ wstring prepare(wstring::size_type len, unsigned nchunks)
 
 void check(wistream& stream, const wstring& str, unsigned nchunks)
 {
-  bool test __attribute__((unused)) = true;
-
   wchar_t* chunk = new wchar_t[str.size()];
   wmemset(chunk, L'X', str.size());
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/9555-ic.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/9555-ic.cc
index 5d87162..5528169 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/9555-ic.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/9555-ic.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wistream is(&b);
   is.exceptions(std::wios::badbit);
@@ -45,8 +44,7 @@ void testthrow(T arg)
     }
   catch(...) 
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }    
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc
index 93b2cc6..365eb1c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc
@@ -28,7 +28,6 @@ void test01()
 {
   typedef std::ios::traits_type ctraits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string str_01;
   const std::string str_02("art taylor kickin it on DAKAR");
   std::string strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc
index 473aa25..08125ba 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc
@@ -30,7 +30,6 @@
 // filebufs.
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
   const char name_01[] = "istream_extractor_other-1.txt"; //read 
   const char name_02[] = "istream_extractor_other-2.txt"; //write
 
@@ -40,12 +39,11 @@ void test02()
   VERIFY( fbin.is_open() );
   VERIFY( fbout.is_open() );
 
-  if (test)
-    {
-      std::istream is(&fbin);
-      is.unsetf(std::ios_base::skipws);
-      is >> &fbout;
-    }
+  {
+    std::istream is(&fbin);
+    is.unsetf(std::ios_base::skipws);
+    is >> &fbout;
+  }
 
   fbout.close();
   fbin.close();
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/26181.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/26181.cc
index fbfb399..96529c2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/26181.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/26181.cc
@@ -23,7 +23,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   typedef istringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc
index a94f00b..e34529db 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc
@@ -25,8 +25,7 @@
 
 void test03() 
 {
-  using namespace std;  
-  bool test __attribute__((unused)) = true;
+  using namespace std;
 
   // template<_CharT, _Traits>
   //  basic_istream& operator>>(ios_base& (*pf) (ios_base&))
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
index f789c2f..65e8812 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
@@ -46,8 +46,6 @@ private:
 
 void test09()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::istringstream stream("Bad Moon Rising");
   Outbuf buf;
   stream >> &buf;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc
index 55fdf49..a5a69f8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9424-in.cc
@@ -87,8 +87,6 @@ const char Inbuf_2::buf[] = "Atteivlis";
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
-
   Inbuf_2 inbuf1;
   std::istream is(&inbuf1);
   Outbuf_2 outbuf1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc
index 7eda728..3058e5a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9555-io.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::istream is(&b);
   is.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/error_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/error_failbit.cc
index 089ea8f..c0d9e41c3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/error_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/error_failbit.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test6()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stringbuf sbuf("", ios_base::out);
@@ -39,7 +38,6 @@ void test6()
 
 void test8()
 {
-  bool test __attribute__((unused)) = true;
   istringstream stream("foo, bar, qux");
   __gnu_test::fail_streambuf bob;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_badbit_throw.cc
index 72d3ed3..16291c0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test14()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stream.exceptions(ios_base::badbit);
@@ -45,7 +44,6 @@ void test14()
 
 void test16()
 {
-  bool test __attribute__((unused)) = true;
   istringstream stream("foo, bar, qux");
   stream.exceptions(ios_base::badbit);
   __gnu_test::fail_streambuf bob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_failbit_throw.cc
index 3e27885..d466b0b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_failbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test10()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stream.exceptions(ios_base::failbit);
@@ -50,7 +49,6 @@ void test10()
 
 void test12()
 {
-  bool test __attribute__((unused)) = true;
   istringstream stream("foo, bar, qux");
   stream.exceptions(ios_base::failbit);
   __gnu_test::fail_streambuf bob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc
index f6842fb..c86542f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc
@@ -28,7 +28,6 @@ using namespace std;
 
 void test2()
 {
-  bool test __attribute__((unused)) = true;
   istringstream stream;
   stream >> static_cast<streambuf*>(0);
   VERIFY(stream.rdstate() & ios_base::failbit);
@@ -36,7 +35,6 @@ void test2()
 
 void test4()
 {
-  bool test __attribute__((unused)) = true;
   istringstream stream;
   stream.exceptions(ios_base::failbit);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
index 6730e41..49221ee 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
@@ -36,8 +36,6 @@ void test03()
 
   stringbuf_type strbuf01;
   istream_type iss(&strbuf01);
-
-  bool test __attribute__((unused)) = true;
   
   try 
     { 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc
index 353117fa5..bdd56fd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/1.cc
@@ -26,7 +26,6 @@ void test01()
 {
   typedef std::wios::traits_type ctraits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01;
   const std::wstring str_02(L"art taylor kickin it on DAKAR");
   std::wstring strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc
index 55698a0..1a9aca0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc
@@ -26,7 +26,6 @@
 // filebufs.
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
   const char name_01[] = "wistream_extractor_other-1.txt"; //read 
   const char name_02[] = "wistream_extractor_other-2.txt"; //write
 
@@ -36,12 +35,11 @@ void test02()
   VERIFY( fbin.is_open() );
   VERIFY( fbout.is_open() );
 
-  if (test)
-    {
-      std::wistream is(&fbin);
-      is.unsetf(std::ios_base::skipws);
-      is >> &fbout;
-    }
+  {
+    std::wistream is(&fbin);
+    is.unsetf(std::ios_base::skipws);
+    is >> &fbout;
+  }
 
   fbout.close();
   fbin.close();
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc
index 2d646dc..218ab80 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/26181.cc
@@ -23,7 +23,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   typedef wistringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc
index 7865d43..bb42f09 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/3.cc
@@ -24,7 +24,6 @@
 void test03() 
 {
   using namespace std;  
-  bool test __attribute__((unused)) = true;
 
   // template<_CharT, _Traits>
   //  basic_istream& operator>>(ios_base& (*pf) (ios_base&))
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc
index f7ab5db..d46133e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9318-in.cc
@@ -44,8 +44,6 @@ private:
 
 void test09()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::wistringstream stream(L"Bad Moon Rising");
   Outbuf buf;
   stream >> &buf;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc
index dc4dcf1..82b935ef 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9424-in.cc
@@ -86,8 +86,6 @@ const wchar_t Inbuf_2::buf[] = L"Atteivlis";
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
-
   Inbuf_2 inbuf1;
   std::wistream is(&inbuf1);
   Outbuf_2 outbuf1;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc
index ab59e79..517d1cb1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/9555-io.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wistream is(&b);
   is.exceptions(std::wios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/error_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/error_failbit.cc
index 5536953..4d24992 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/error_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/error_failbit.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test6()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   wstringbuf sbuf(L"", ios_base::out);
@@ -39,7 +38,6 @@ void test6()
 
 void test8()
 {
-  bool test __attribute__((unused)) = true;
   wistringstream stream(L"foo, bar, qux");
   __gnu_test::fail_wstreambuf bob;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_badbit_throw.cc
index 155b96f..18214d6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test14()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   stream.exceptions(ios_base::badbit);
@@ -45,7 +44,6 @@ void test14()
 
 void test16()
 {
-  bool test __attribute__((unused)) = true;
   wistringstream stream(L"foo, bar, qux");
   stream.exceptions(ios_base::badbit);
   __gnu_test::fail_wstreambuf bob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_failbit_throw.cc
index d99fc19..e6b44f7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_failbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test10()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   stream.exceptions(ios_base::failbit);
@@ -50,7 +49,6 @@ void test10()
 
 void test12()
 {
-  bool test __attribute__((unused)) = true;
   wistringstream stream(L"foo, bar, qux");
   stream.exceptions(ios_base::failbit);
   __gnu_test::fail_wstreambuf bob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc
index 7ca929f..9dd99d3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc
@@ -28,7 +28,6 @@ using namespace std;
 
 void test2()
 {
-  bool test __attribute__((unused)) = true;
   wistringstream stream;
   stream >> static_cast<wstreambuf*>(0);
   VERIFY( stream.rdstate() & ios_base::failbit );
@@ -36,7 +35,6 @@ void test2()
 
 void test4()
 {
-  bool test __attribute__((unused)) = true;
   wistringstream stream;
   stream.exceptions(ios_base::failbit);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc
index f830e13..6f5734e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc
@@ -28,7 +28,6 @@ test03()
 {
   typedef std::char_traits<char>	traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = 
   "   sun*ra \n\t\t\t   & his arkestra, featuring john gilmore: \n"
   "                         "
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc
index 56a1f1b..52975e7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc
@@ -34,7 +34,6 @@
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   const char* tfn = "istream_unformatted-1.txt";
   std::ifstream infile;
   infile.open(tfn);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/3.cc
index da92b16..1e71896 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/3.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf strbuf01;
   stringbuf strbuf02;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc
index f5b522c..5d8aa5d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/1.cc
@@ -26,7 +26,6 @@ test03()
 {
   typedef std::char_traits<wchar_t>	traits_type;
 
-  bool test __attribute__((unused)) = true;
   const wchar_t str_lit01[] = 
   L"   sun*ra \n\t\t\t   & his arkestra, featuring john gilmore: \n"
   L"                         "
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc
index ccc838a..d73a16e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc
@@ -30,7 +30,6 @@
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   const char* tfn = "istream_unformatted-1.txt";
   std::wifstream infile;
   infile.open(tfn);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/3.cc
index 7c5c45f..932391a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/3.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf strbuf01;
   wstringbuf strbuf02;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc
index b1d24f2..eb83fa7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc
@@ -28,7 +28,6 @@ test02()
 {
   typedef std::char_traits<char>	traits_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = "\t\t\t    sun*ra \n"
   "                            "
   "and his myth science arkestra present\n"
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc
index 044c8d6..c5088ea 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc
@@ -45,7 +45,6 @@ test05()
 "aaaaaaaaaaaaa\n"
 "aaaaaaaaaaaaaa\n";
 
-  bool test __attribute__((unused)) = true;
   const std::streamsize it = 5;
   std::streamsize br = 0;
   char tmp[it];
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc
index 75087bf..825c72c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc
@@ -32,7 +32,6 @@ test06()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const streamsize it = 5;
   char tmp[it];
   const char* str_lit = "abcd\n";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/4.cc
index afea0e3..8c8374b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/4.cc
@@ -55,7 +55,6 @@ const char Inbuf::buf[] = "1234567890abcdefghij";
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef char_traits<char>   traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/5.cc
index a0e0c9e..368b200 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/5.cc
@@ -42,8 +42,6 @@ string prepare(string::size_type len, unsigned nchunks, char delim)
 
 void check(istream& stream, const string& str, unsigned nchunks, char delim)
 {
-  bool test __attribute__((unused)) = true;
-
   char buf[1000000];
   string::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/6.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/6.cc
index f014cc1..8eaf6e4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/6.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf strbuf01;
   stringbuf strbuf02;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc
index 9592510..5711dd2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/1.cc
@@ -26,7 +26,6 @@ test02()
 {
   typedef std::char_traits<wchar_t>	traits_type;
 
-  bool test __attribute__((unused)) = true;
   const wchar_t str_lit01[] = L"\t\t\t    sun*ra \n"
   L"                            "
   L"and his myth science arkestra present\n"
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc
index a8dff13..062fbfd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/2.cc
@@ -43,7 +43,6 @@ L"aaaaaaaaaaaa\n"
 L"aaaaaaaaaaaaa\n"
 L"aaaaaaaaaaaaaa\n";
 
-  bool test __attribute__((unused)) = true;
   const std::streamsize it = 5;
   std::streamsize br = 0;
   wchar_t tmp[it];
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/3.cc
index c0ead59..2277d19 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/3.cc
@@ -30,7 +30,6 @@ test06()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const streamsize it = 5;
   wchar_t tmp[it];
   const wchar_t* str_lit = L"abcd\n";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc
index 5f7cbe2..6ff688f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/4.cc
@@ -55,7 +55,6 @@ const wchar_t Inbuf::buf[] = L"1234567890abcdefghij";
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef char_traits<wchar_t>   traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc
index 1fb99d9..698afdf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc
@@ -48,8 +48,6 @@ prepare(wstring::size_type len, unsigned nchunks, wchar_t delim)
 void
 check(wistream& stream, const wstring& str, unsigned nchunks, wchar_t delim)
 {
-  bool test __attribute__((unused)) = true;
-
   static wchar_t buf[1000000];
   wstring::size_type index = 0, index_new = 0;
   unsigned n = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/6.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/6.cc
index 9548640..e23d2bd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/6.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf strbuf01;
   wstringbuf strbuf02;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc
index 5faf23d..3fff5a2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc
@@ -28,7 +28,6 @@ test01()
 {
   typedef std::ios::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string str_01;
   const std::string str_02("soul eyes: john coltrane quartet");
   std::string strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/2.cc
index 6e70be2..e64c298 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/2.cc
@@ -43,8 +43,6 @@ string prepare(string::size_type len, unsigned nchunks, char delim)
 
 void check(istream& stream, const string& str, unsigned nchunks, char delim)
 {
-  bool test __attribute__((unused)) = true;
-
   string::size_type index = 0, index_new = 0;
   unsigned n = 0;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc
index e02b487..1ff24a6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/3.cc
@@ -33,7 +33,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char filename[] ="istream_unformatted-1.txt";
   ios_base::iostate state1, state2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc
index 377e0e5..b75355e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc
@@ -28,7 +28,6 @@ void
 test08()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringstream ss("abcd" "\xFF" "1234ina donna coolbrith");  
   char c;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc
index 6b11daa..3ac70ba 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc
@@ -28,7 +28,6 @@ void
 test10()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   typedef string string_type;
   typedef stringbuf stringbuf_type;
   typedef istream istream_type;
@@ -40,23 +39,19 @@ test10()
   
   istr.ignore(0);
   if (istr.gcount() != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   istr.ignore(0, 'b');
   if (istr.gcount() != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   istr.ignore();	// Advance to next position.
   istr.ignore(0, 'b');
   if ((n=istr.gcount()) != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   if (istr.peek() != 'b')
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc
index b7dd921..2bd14a2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/1.cc
@@ -26,7 +26,6 @@ test01()
 {
   typedef std::ios::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01;
   const std::wstring str_02(L"soul eyes: john coltrane quartet");
   std::wstring strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc
index 91ed539..c732eeb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc
@@ -49,8 +49,6 @@ prepare(wstring::size_type len, unsigned nchunks, wchar_t delim)
 void
 check(wistream& stream, const wstring& str, unsigned nchunks, wchar_t delim)
 {
-  bool test __attribute__((unused)) = true;
-
   wstring::size_type index = 0, index_new = 0;
   unsigned n = 0;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc
index f395ee9..b7d7c85 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc
@@ -29,7 +29,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char filename[] ="istream_unformatted-1.txt";
   ios_base::iostate state1, state2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc
index 8919363..d5e8773 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/6360.cc
@@ -26,7 +26,6 @@ void
 test08()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringstream ss(L"abcd" L"\xFF" L"1234ina donna coolbrith");  
   wchar_t c;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc
index 1ad7146..bde00d5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/7220.cc
@@ -26,7 +26,6 @@ void
 test10()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   typedef wstring string_type;
   typedef wstringbuf stringbuf_type;
   typedef wistream istream_type;
@@ -38,23 +37,19 @@ test10()
   
   istr.ignore(0);
   if (istr.gcount() != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   istr.ignore(0, L'b');
   if (istr.gcount() != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   istr.ignore();	// Advance to next position.
   istr.ignore(0, L'b');
   if ((n=istr.gcount()) != 0) 
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
   
   if (istr.peek() != L'b')
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc
index 39eedc4..ac7adfb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc
@@ -28,7 +28,6 @@ test01()
 {
   typedef std::ios::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string str_01;
   const std::string str_02("soul eyes: john coltrane quartet");
   std::string strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/12296.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/12296.cc
index 9038be4..b05df1b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/12296.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/12296.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   istringstream stream;
   VERIFY( stream.rdstate() == ios_base::goodbit );
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc
index a45b34c..ed3335c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc
@@ -29,7 +29,6 @@
 // fstreams
 void test04(void)
 {
-  bool test __attribute__((unused)) = true;
   std::istream::pos_type pos01, pos02;
   const char str_lit01[] = "istream_seeks-1.txt";
   std::ifstream if01(str_lit01, std::ios_base::in | std::ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc
index fc788b3..a829f44 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/1.cc
@@ -26,7 +26,6 @@ test01()
 {
   typedef std::wios::traits_type traits_type;
 
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01;
   const std::wstring str_02(L"soul eyes: john coltrane quartet");
   std::wstring strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/12296.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/12296.cc
index 503b7ca..b9773d6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/12296.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/12296.cc
@@ -24,7 +24,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wistringstream stream;
   VERIFY( stream.rdstate() == ios_base::goodbit );
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc
index 7afc425..6aa4469 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/wchar_t/6414.cc
@@ -27,7 +27,6 @@
 // fstreams
 void test04(void)
 {
-  bool test __attribute__((unused)) = true;
   std::wistream::pos_type pos01, pos02;
   const char str_lit01[] = "wistream_seeks-1.txt";
   std::wifstream if01(str_lit01, std::ios_base::in | std::ios_base::out);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc
index 4f2caca..6aa7230 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc
@@ -26,7 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const std::string str_01;
   const std::string str_02("soul eyes: john coltrane quartet");
   std::string strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/putback/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/putback/wchar_t/1.cc
index be86d4a..9d6c049 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/putback/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/putback/wchar_t/1.cc
@@ -24,7 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring str_01;
   const std::wstring str_02(L"soul eyes: john coltrane quartet");
   std::wstring strtmp;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc
index 49df5ea..b71bd88 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const std::string str_02("soul eyes: john coltrane quartet");
 
   std::stringbuf isbuf_03(str_02, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc
index a06a95e..f7d0c61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc
@@ -28,8 +28,6 @@
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string str_00("Red_Garland_Qunitet-Soul_Junction");
   char c_array[str_00.size() + 4];
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc
index 054946b..1a4f24f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc
@@ -28,14 +28,12 @@ void
 test09()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   istringstream iss("Juana Briones");
   char tab[13];
   iss.read(tab, 13);
   if (!iss)
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
 }
  
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc
index 0965ad4..4f21574 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/1.cc
@@ -25,7 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring str_02(L"soul eyes: john coltrane quartet");
 
   std::wstringbuf isbuf_03(str_02, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/2.cc
index e24bf3d..2d7234f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/2.cc
@@ -26,8 +26,6 @@
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring str_00(L"Red_Garland_Qunitet-Soul_Junction");
   wchar_t c_array[str_00.size() + 4];
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/3.cc
index d7438be..efcf09a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/wchar_t/3.cc
@@ -26,14 +26,12 @@ void
 test09()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wistringstream iss(L"Juana Briones");
   wchar_t tab[13];
   iss.read(tab, 13);
   if (!iss)
-    test = false;
-  VERIFY( test );
+    VERIFY( false );
 }
  
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc
index d3d4464..07523b1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc
@@ -27,7 +27,6 @@
 void test12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   streamsize sum = 0;
   istringstream iss("shamma shamma");
       
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc
index 7c12f64..4c18627 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc
@@ -36,7 +36,6 @@
 void test13()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   streamsize sum = 0;
   ifstream ifs("istream_unformatted-1.tst");
       
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc
index 04a040e..64ef334 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc
@@ -29,7 +29,6 @@ class mybuf : public std::basic_streambuf<char>
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   char arr[10];
   mybuf sbuf;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc
index 8486d18..f9d08c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-1.cc
@@ -25,7 +25,6 @@
 void test12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   streamsize sum = 0;
   wistringstream iss(L"shamma shamma");
       
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc
index eef671d..a7922d7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc
@@ -34,7 +34,6 @@
 void test13()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   streamsize sum = 0;
   wifstream ifs("wistream_unformatted-1.tst");
       
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc
index 274a23f..78f87df 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/8258.cc
@@ -27,7 +27,6 @@ class mybuf : public std::basic_streambuf<wchar_t>
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   wchar_t arr[10];
   mybuf sbuf;
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc
index ebd48fc..f2e71a6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   istringstream ist("the lamb lies down on broadway");
   ios::pos_type pos = ist.tellg();
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/26211.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/26211.cc
index 2a49587..d0b5d5c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/26211.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/26211.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef istringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc
index b08cfa0..7f3d515 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc
@@ -28,7 +28,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   string num1("555");
 
   // seekg
@@ -37,10 +36,10 @@ void test06(void)
     istream::pos_type pos1 = iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(pos1);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc
index d0b8c10..d6ef6db 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc
@@ -28,7 +28,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   string num1("555");
 
   // seekg
@@ -37,10 +36,10 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(0, ios_base::beg);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/exceptions_badbit_throw.cc
index ae559b5..cc22226 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stream.exceptions(ios_base::badbit);
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc
index 41cf00a..14c7035 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/fstream.cc
@@ -34,7 +34,6 @@ void test04(void)
 {
   typedef std::istream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "istream_seeks-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc
index 41155bd..5bb7dce 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc
@@ -34,7 +34,6 @@ void test05(void)
 {
   typedef std::istream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "istream_seeks-1.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/2.cc
index 1e45fc1..4456c88 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/2.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wistringstream ist(L"the lamb lies down on broadway");
   wios::pos_type pos = ist.tellg();
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc
index 0ebc6f4..e60cb30 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef wistringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc
index 9005ce5..c7dc8af 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc
@@ -26,7 +26,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   wstring num1(L"555");
 
   // seekg
@@ -35,10 +34,10 @@ void test06(void)
     wistream::pos_type pos1 = iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(pos1);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc
index dcfb4b4..918296a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/8348-2.cc
@@ -26,7 +26,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   wstring num1(L"555");
 
   // seekg
@@ -35,10 +34,10 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(0, ios_base::beg);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/exceptions_badbit_throw.cc
index 2a9a56d..a260fcd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   stream.exceptions(ios_base::badbit);
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc
index 9214bb3..d5daa36 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/fstream.cc
@@ -32,7 +32,6 @@ void test04(void)
 {
   typedef std::wistream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::wistream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "wistream_seeks-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc
index b9e7cce..b6fc400 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc
@@ -32,7 +32,6 @@ void test05(void)
 {
   typedef std::istream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::wistream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "wistream_seeks-1.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/1.cc
index ef23f57..ddd134b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const char* lit01 = "stereolab on the bolsinga tip";
   const std::string str01(lit01);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/2.cc
index b09017d..70c89c9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/2.cc
@@ -30,7 +30,6 @@ test02()
 {
   using namespace std;
   istringstream in("80.21 56.89 12.3");
-  bool test __attribute__((unused)) = true;
   int i = 0;
   double x;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3.cc
index 509faed..abf03bc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3.cc
@@ -28,8 +28,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::stringbuf strbuf01;
   std::istream strm1(&strbuf01);
   const std::istream::sentry sentry1(strm1);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
index f7454912..2f46f75 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
@@ -35,9 +35,6 @@ void test01()
   typedef basic_stringbuf<pod_ushort> 	stringbuf_type;
   typedef basic_istream<pod_ushort> 	istream_type;
 
-  bool test __attribute__((unused)) = true;
-
-
   const string_type str01;
   stringbuf_type strbuf01;
   stringbuf_type strbuf02(str01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/1.cc
index 273c8d9..24f94fd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/1.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* lit01 = L"stereolab on the bolsinga tip";
   const std::wstring str01(lit01);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/2.cc
index 59143e1..6fb4a4f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/2.cc
@@ -28,7 +28,6 @@ test02()
 {
   using namespace std;
   wistringstream in(L"80.21 56.89 12.3");
-  bool test __attribute__((unused)) = true;
   int i = 0;
   double x;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/3.cc
index ad7f5539..a8b4d94 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/3.cc
@@ -26,8 +26,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstringbuf strbuf01;
   std::wistream strm1(&strbuf01);
   const std::wistream::sentry sentry1(strm1);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc
index 3fee590..ce04b22 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc
@@ -35,7 +35,6 @@ void test01()
   typedef ios::off_type off_type;
   typedef ios::pos_type pos_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = "istream_seeks-1.tst";
 
   // in
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc
index ec34c8e..c097fed 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/2.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   istringstream ist("three sides live");
   ist.ignore(4);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/26211.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/26211.cc
index d04eb41..502a46d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/26211.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/26211.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef istringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc
index 5fe13d9..f692988 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc
@@ -28,7 +28,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   string num1("555");
 
   // tellg
@@ -37,11 +36,11 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.clear();
     iss.tellg();
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 
   // seekg
@@ -50,10 +49,10 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(0, ios_base::beg);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 
   // seekg
@@ -62,10 +61,10 @@ void test06(void)
     istream::pos_type pos1 = iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(pos1);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/exceptions_badbit_throw.cc
index 2749e0f..5d51222 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   istream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc
index 3b0bd6c..af22926 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/fstream.cc
@@ -34,7 +34,6 @@ void test04(void)
 {
   typedef std::istream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "istream_seeks-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc
index 23b4fba..2adf5d9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc
@@ -34,7 +34,6 @@ void test05(void)
 {
   typedef std::istream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "istream_seeks-1.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc
index 865f373..1ec1a0b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc
@@ -33,7 +33,6 @@ void test01()
   typedef ios::off_type off_type;
   typedef ios::pos_type pos_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = "wistream_seeks-1.tst";
 
   // in
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/2.cc
index 1b7a040..620cd27 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/2.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wistringstream ist(L"three sides live");
   ist.ignore(4);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc
index 67c66f4e..bb8095b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef wistringstream::pos_type pos_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc
index 95bf69a..c75e2bb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc
@@ -26,7 +26,6 @@
 void test06(void)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   wstring num1(L"555");
 
   // tellg
@@ -35,11 +34,11 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.clear();
     iss.tellg();
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 
   // seekg
@@ -48,10 +47,10 @@ void test06(void)
     iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(0, ios_base::beg);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 
   // seekg
@@ -60,10 +59,10 @@ void test06(void)
     wistream::pos_type pos1 = iss.tellg();
     int asNum = 0;
     iss >> asNum;
-    VERIFY( test = iss.eof() );
-    VERIFY( test = !iss.fail() );
+    VERIFY( iss.eof() );
+    VERIFY( !iss.fail() );
     iss.seekg(pos1);
-    VERIFY( test = !iss.fail() );
+    VERIFY( !iss.fail() );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/exceptions_badbit_throw.cc
index de1b479..e38832f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wistream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc
index fba005e..ca049b2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/fstream.cc
@@ -32,7 +32,6 @@ void test04(void)
 {
   typedef std::wistream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::wistream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "wistream_seeks-1.txt";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc
index 1ae861b..a88b565 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc
@@ -30,7 +30,6 @@ void test05(void)
 {
   typedef std::wistream::off_type off_type;
 
-  bool test __attribute__((unused)) = true;
   std::wistream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
   const char str_lit01[] = "wistream_seeks-1.tst";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ws/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ws/char/1.cc
index ab8d73f..fdd4d23 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ws/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ws/char/1.cc
@@ -26,8 +26,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const char str_lit01[] = "  venice ";
   const std::string str01(" santa barbara ");
   std::string str02(str_lit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ws/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ws/wchar_t/1.cc
index f842e04..89163ff 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istream/ws/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/ws/wchar_t/1.cc
@@ -24,8 +24,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const wchar_t str_lit01[] = L"  venice ";
   const std::wstring str01(L" santa barbara ");
   std::wstring str02(str_lit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/2020.cc
index 79dc302..cce982f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_istringstream<__gnu_test::pod_ushort> gnu_isstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
index 3341559..5793fd9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
@@ -33,7 +33,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
index b9f2aea..fb395f8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
@@ -31,7 +31,6 @@ active_buffer(std::wios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* strlit01 = L"fuck war";
   const std::wstring str00;
   const std::wstring str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
index 763375d..b2526df 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::istringstream is01;
   const std::string str00; 
   const std::string str01 = "123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
index 7147942..0530cbb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::wistringstream is01;
   const std::wstring str00; 
   const std::wstring str01 = L"123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/2020.cc
index c139262..f8f1147 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_ofstream<__gnu_test::pod_ushort> gnu_ofstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
index d64a1ba..169b4e3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/cons/char/1.cc
@@ -30,7 +30,6 @@ const char name_02[] = "ofstream_members-1.txt";
 // http://gcc.gnu.org/ml/libstdc++/2000-07/msg00004.html
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const int more_than_max_open_files = 8200;
   
   for(int i = 0; ++i < more_than_max_open_files;)
diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc
index ba852f7..2b9729f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc
@@ -31,7 +31,6 @@ const char name_02[] = "ofstream_members-1.txt";
 // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::ofstream ofs1;
   ofs1.close();
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
index d89dc26..651f71d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/rdbuf/char/2832.cc
@@ -36,7 +36,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc
index bf21113..a5d5e1a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_ostream<__gnu_test::pod_ushort> gnu_ostr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/char/9827.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/char/9827.cc
index 7eb7064..2802043 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/char/9827.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/char/9827.cc
@@ -29,7 +29,6 @@ class Buf : public std::streambuf
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   Buf buf;
   ostream stream(&buf);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc
index cdc0a9a..42e4baa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/cons/wchar_t/9827.cc
@@ -27,7 +27,6 @@ class Buf : public std::wstreambuf
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   Buf buf;
   wostream stream(&buf);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
index d163c5f..ec6fe5d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
@@ -25,8 +25,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string str01(" santa barbara ");
   std::string str04;
   std::string str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/wchar_t/1.cc
index f560f2b..d8eb12b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/wchar_t/1.cc
@@ -23,8 +23,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring str01(L" santa barbara ");
   std::wstring str04;
   std::wstring str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
index 5d39483..94c5f12 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
@@ -25,8 +25,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string str01(" santa barbara ");
   std::string str04;
   std::string str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
index 4348ba0..e7029d7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
@@ -30,7 +30,6 @@ void test02()
   using namespace std;
   typedef ostringstream::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   ostringstream osst_01;
   const string str_00("herbie_hancock");
   int_type len1 = str_00.size();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/1.cc
index 590e806..5675042 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/1.cc
@@ -23,8 +23,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring str01(L" santa barbara ");
   std::wstring str04;
   std::wstring str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/2.cc
index f4605a1..1c41018 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/wchar_t/2.cc
@@ -28,7 +28,6 @@ void test02()
   using namespace std;
   typedef wostringstream::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   wostringstream osst_01;
   const wstring str_00(L"herbie_hancock");
   int_type len1 = str_00.size();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/char/9561.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/char/9561.cc
index 70d6f52..4543ab7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/char/9561.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/char/9561.cc
@@ -37,7 +37,6 @@ struct buf: std::streambuf
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   buf b;
   std::ostream strm (&b);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc
index bf86310..08796a5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/exceptions/wchar_t/9561.cc
@@ -35,7 +35,6 @@ struct buf: std::wstreambuf
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   buf b;
   std::wostream strm(&b);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
index 776bf3d..72913ba 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
@@ -25,8 +25,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::string str01(" santa barbara ");
   std::string str04;
   std::string str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/2.cc
index c7b8e4d..fee1f03 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/2.cc
@@ -29,8 +29,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::sync_streambuf buf;
   std::ostream os(&buf);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc
index d75bee0..96bd5ae 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   ostream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/1.cc
index 75cb478..2816bd7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/1.cc
@@ -23,8 +23,6 @@
 
 void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   const std::wstring str01(L" santa barbara ");
   std::wstring str04;
   std::wstring str05;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/2.cc
index a8535e9..496fb61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/2.cc
@@ -27,8 +27,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::sync_wstreambuf buf;
   std::wostream os(&buf);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/exceptions_badbit_throw.cc
index 2b02292..4f59858 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wostream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
index 72b978d..2098b39 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/1.cc
@@ -142,7 +142,6 @@ void apply_formatting(const _TestCase & tc, basic_ostream<_CharT> & os)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   for (std::size_t j = 0; j<sizeof(testcases)/sizeof(testcases[0]); j++)
     {
       _TestCase & tc = testcases[j];
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
index af8f127..3dd3b7d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
@@ -31,7 +31,6 @@ void
 test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   // Make sure we can output a long float in fixed format
   // without seg-faulting (libstdc++/4402)
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc
index 25ed6b0..fe3eff6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/3.cc
@@ -23,11 +23,10 @@
 #include <testsuite_hooks.h>
 
 template<typename T>
-bool
+void
 test03_check(T n)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf strbuf;
   ostream o(&strbuf);
@@ -44,8 +43,6 @@ test03_check(T n)
 
   o << oct << n << ' ' << hex << n;
   VERIFY ( strbuf.str() == expect );
-
-  return test;
 }
 
 void
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc
index 656489b..3e44d87 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4.cc
@@ -27,7 +27,6 @@ int
 test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf strbuf1, strbuf2;
   ostream o1(&strbuf1), o2(&strbuf2);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc
index a8d528e..117c551 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/4402.cc
@@ -29,7 +29,6 @@ void
 test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   // make sure we can output a very long float
   long double val = numeric_limits<long double>::max();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc
index e4670f1..ee8c973 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/5.cc
@@ -28,7 +28,6 @@ void
 test05()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   double pi = 3.14159265358979323846;
   ostringstream ostr;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc
index 1ddf9dc..7acfc3c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/6.cc
@@ -31,7 +31,6 @@ void
 test06()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   int prec = numeric_limits<double>::digits10 + 2;
   double oval = numeric_limits<double>::min();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc
index 2291de1..e15b741 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/7.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringstream ostr1, ostr2, ostr3, ostr4;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc
index 771cf3d..48c20b4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/9555-oa.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::ostream os(&b);
   os.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_badbit_throw.cc
index 5ef82da..4bd27e1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_badbit_throw.cc
@@ -27,7 +27,6 @@ template<typename T>
 void test_badbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_put_char);
   ostringstream stream("jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_failbit_throw.cc
index b39e978..535c5d4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/exceptions_failbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_put_char);
   ostringstream stream("jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc
index 7ad69f6..f9172b9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/pod/23875.cc
@@ -23,7 +23,6 @@
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>
 
-bool test __attribute__((unused)) = true;
 using __gnu_test::pod_ushort;
 
 namespace std
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
index 4c98653..d8b25db 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/1.cc
@@ -143,7 +143,6 @@ void apply_formatting(const _TestCase & tc, basic_ostream<_CharT> & os)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   for (std::size_t j = 0; j<sizeof(testcases)/sizeof(testcases[0]); j++)
     {
       _TestCase & tc = testcases[j];
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc
index 42c1296..ca0634d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc
@@ -28,7 +28,6 @@ void
 test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   // Make sure we can output a long float in fixed format
   // without seg-faulting (libstdc++/4402)
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc
index 3f54e31..019df5d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/3.cc
@@ -20,11 +20,10 @@
 #include <testsuite_hooks.h>
 
 template<typename T>
-bool
+void
 test03_check(T n)
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf strbuf;
   wostream o(&strbuf);
@@ -41,8 +40,6 @@ test03_check(T n)
 
   o << oct << n << L' ' << hex << n;
   VERIFY ( strbuf.str() == expect );
-
-  return test;
 }
 
 void
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc
index 0c1db6a..76be383 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4.cc
@@ -24,7 +24,6 @@ int
 test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf strbuf1, strbuf2;
   wostream o1(&strbuf1), o2(&strbuf2);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc
index cb16e58..54317dd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/4402.cc
@@ -28,7 +28,6 @@ void
 test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   // make sure we can output a very long float
   long double val = numeric_limits<long double>::max();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc
index 9bdab94..f1eae41 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/5.cc
@@ -25,7 +25,6 @@ void
 test05()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   double pi = 3.14159265358979323846;
   wostringstream ostr;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc
index d256899..6b23bc6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/6.cc
@@ -28,7 +28,6 @@ void
 test06()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   int prec = numeric_limits<double>::digits10 + 2;
   double oval = numeric_limits<double>::min();
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc
index 90ec999..e9ca6c5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/7.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringstream ostr1, ostr2, ostr3, ostr4;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/9555-oa.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/9555-oa.cc
index 540c065..066658b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/9555-oa.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/9555-oa.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wostream os(&b);
   os.exceptions(std::wios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_badbit_throw.cc
index 6a5b903..608fece 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_badbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_badbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_put_wchar_t);
   wostringstream stream(L"jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_failbit_throw.cc
index 4ce4a1e..7c7719d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/exceptions_failbit_throw.cc
@@ -25,7 +25,6 @@ template<typename T>
 void test_failbit()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   locale loc(locale::classic(), new __gnu_test::fail_num_put_wchar_t);
   wostringstream stream(L"jaylib - champion sound");
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc
index bbc7573..782b667 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oa.cc
@@ -28,8 +28,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc
index a59622e..c87714c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-ob.cc
@@ -28,8 +28,6 @@
 void
 test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc
index 40b9139..0d65873 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/11095-oc.cc
@@ -28,8 +28,6 @@
 void
 test03() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
index ce9526e..c35bb5c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
@@ -29,7 +29,6 @@
 void
 test02(void) 
 {
-  bool test __attribute__((unused)) = true;
   std::string tmp;
   
   std::string str01 = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc
index a0447c0..43ba92c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   ostringstream oss_01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc
index 59abec7..ea83586 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   ostringstream oss_01;
   const string str_01(50, 'a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
index efedea4..aac04cb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
@@ -28,7 +28,6 @@
 // right
 void test03(void) 
 {
-  bool test __attribute__((unused)) = true;
   std::string tmp;
 
   std::string str01 = "";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
index 37c7fa4..4805c47 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
@@ -28,7 +28,6 @@
 void
 test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string str_01;
   std::string str_tmp;
   const int i_max=250;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
index aa8a2a7..4683855 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
@@ -28,7 +28,6 @@
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
   std::string str05, str10;
 
   typedef std::ostream::pos_type	pos_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
index fae6455..070c3f5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
@@ -28,7 +28,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00326.html
 void test06()
 {
-  bool test __attribute__((unused)) = true;
   const char carray01[] = "mos def & talib kweli are black star";
 
   // normal
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
index 8bc0b77..09716b4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
@@ -26,7 +26,6 @@
 
 void test08()
 {
-  bool test __attribute__((unused)) = true;
   char* pt = 0;
 
   // 1
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc
index f5dd0c9..fd6db05 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/9555-oc.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::ostream os(&b);
   os.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-od.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-od.cc
index dbce3c7..a57913b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-od.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-od.cc
@@ -28,8 +28,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-oe.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-oe.cc
index c61dff7..49094cb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-oe.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-oe.cc
@@ -28,8 +28,6 @@
 void
 test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-of.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-of.cc
index 5501745..15a194c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-of.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/11095-of.cc
@@ -28,8 +28,6 @@
 void
 test03() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream oss_01;
 
   oss_01.width(-60);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc
index a36a55e..91bdf76 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/2.cc
@@ -27,7 +27,6 @@
 void
 test02(void) 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring tmp;
   
   std::wstring str01 = L"";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc
index 90ace4d..2b0e928 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream oss_01;
   const string str_01(MAX_SIZE, 'a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc
index 0f7976a..171be12 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream oss_01;
   const string str_01(50, 'a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc
index 39c552a..6853df1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream oss_01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc
index 3e9404a..7982afa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc
@@ -33,7 +33,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream oss_01;
   const wstring str_01(50, L'a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc
index d84fdf4..0ae1d67 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/3.cc
@@ -26,7 +26,6 @@
 // right
 void test03(void) 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring tmp;
 
   std::wstring str01 = L"";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc
index 9e5974e..811ec29 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/4.cc
@@ -28,7 +28,6 @@
 void
 test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str_01;
   std::wstring str_tmp;
   const int i_max=250;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc
index 845a271..003d6ec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/5.cc
@@ -26,7 +26,6 @@
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring str05, str10;
 
   typedef std::wostream::pos_type	pos_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc
index 5f7c06b..74d99ad 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/6.cc
@@ -26,7 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00326.html
 void test06()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t carray01[] = L"mos def & talib kweli are black star";
 
   // normal
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
index 5b33837..5c60ac9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
@@ -51,7 +51,6 @@ protected:
 void test07()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const char* buffer = "SFPL 5th floor, outside carrol, the Asian side";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
index 82cef34..72b0211 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
@@ -26,7 +26,6 @@
 
 void test08()
 {
-  bool test __attribute__((unused)) = true;
   char* pt = 0;
 
   // 2
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/9555-oc.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/9555-oc.cc
index 6ab2c89..6f68aae 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/9555-oc.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/9555-oc.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wostream os(&b);
   os.exceptions(std::wios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc
index 4a7906a..413deb6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/1.cc
@@ -40,7 +40,6 @@ void
 test02() 
 {
   typedef std::ios_base::iostate iostate;
-  bool test __attribute__((unused)) = true;
 
   // basic_ostream<_CharT, _Traits>::operator<<(__streambuf_type* __sb)
   // filebuf-> NULL 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
index 04125e8..7dec74f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
@@ -28,15 +28,12 @@
 void test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   istringstream istr("inside betty carter");
   ostringstream ostr;
   ostr << istr.rdbuf() << endl;
 
   if (ostr.rdstate() & ios_base::eofbit) 
-    test = false;
-
-  VERIFY( test );
+    VERIFY( false );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
index bbb358e..94af469 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
@@ -98,8 +98,6 @@ private:
 
 void test(const std::string& str, std::streambuf& buf)
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream out;
   std::istream in(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/5.cc
index 11f73e6..62d90e6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/5.cc
@@ -40,8 +40,6 @@ std::ios_base& func3(std::ios_base&)
 template<typename T>
 void test(T& (*f)(T&))
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::sync_streambuf buf;
   std::ostream os(&buf);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc
index 94ab4b9..7aabc3e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9318-out.cc
@@ -47,8 +47,6 @@ private:
 
 void test10()
 {
-  bool test __attribute__((unused)) = true;
-
   std::stringbuf sbuf("Bad Moon Rising", std::ios::in);
   Outbuf buf;
   std::ostream stream(&buf);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc
index 5e4f3cc..d670524 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9424-out.cc
@@ -86,9 +86,7 @@ public:
 const char Inbuf_2::buf[] = "Atteivlis";
 
 void test12()
-{ 
-  bool test __attribute__((unused)) = true;
- 
+{
   Outbuf_2 outbuf2;
   std::ostream os (&outbuf2);
   Inbuf_2 inbuf2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc
index 3c48f76..76fec73 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/9555-oo.cc
@@ -29,7 +29,6 @@ struct buf: std::streambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::ostream os(&b);
   os.exceptions(std::ios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc
index d92f351..99e40ea 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc
@@ -28,7 +28,6 @@
 void test()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   char buf[64];
   error_code e1;
@@ -41,14 +40,14 @@ void test()
     s1 = ostr.str();
 
     if (ostr.rdstate() & ios_base::eofbit) 
-      test = false;
+      VERIFY( false );
   }
-  VERIFY( test );
+
   VERIFY( find(s1.begin(), s1.end(), ':') != s1.end() );
 
   sprintf(buf, "%i", e1.value());
   s = buf;
-  VERIFY( s1.find(s) != string::npos);
+  VERIFY( s1.find(s) != string::npos );
 
   {
     ostringstream ostr;
@@ -56,14 +55,14 @@ void test()
     s2 = ostr.str();
 
     if (ostr.rdstate() & ios_base::eofbit) 
-      test = false;
+      VERIFY( false );
   }
-  VERIFY( test );
+
   VERIFY( find(s2.begin(), s2.end(), ':') != s2.end() );
 
   sprintf(buf, "%i", e2.value());
   s = buf;
-  VERIFY( s2.find(s) != string::npos);
+  VERIFY( s2.find(s) != string::npos );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_failbit.cc
index 04b4c60..0bc4993 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/error_failbit.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test5()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bob;
   ostream stream(&bob);
   stringbuf sbuf("Foo, bar, qux", ios_base::in);
@@ -39,7 +38,6 @@ void test5()
 
 void test7()
 {
-  bool test __attribute__((unused)) = true;
   ostringstream stream;
   __gnu_test::fail_streambuf bib;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_badbit_throw.cc
index 1782548..7386dfb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test13()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bob;
   ostream stream(&bob);
   stream.exceptions(ios_base::badbit);
@@ -45,7 +44,6 @@ void test13()
 
 void test15()
 {
-  bool test __attribute__((unused)) = true;
   ostringstream stream;
   stream.exceptions(ios_base::badbit);
   __gnu_test::fail_streambuf bib;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_failbit_throw.cc
index 55b1d1a..c59d4a6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_failbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test9()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bob;
   ostream stream(&bob);
   stream.exceptions(ios_base::failbit);
@@ -50,7 +49,6 @@ void test9()
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   ostringstream stream;
   stream.exceptions(ios_base::failbit);
   __gnu_test::fail_streambuf bib;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc
index 6eac572..06f4ad0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc
@@ -27,7 +27,6 @@
 void test1()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   ostringstream stream;
   stream << static_cast<streambuf*>(0);
@@ -37,7 +36,6 @@ void test1()
 void test3()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   ostringstream stream;
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc
index c629096..acbb27d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc
@@ -35,7 +35,6 @@ void
 test02() 
 {
   typedef std::ios_base::iostate iostate;
-  bool test __attribute__((unused)) = true;
 
   // basic_ostream<_CharT, _Traits>::operator<<(__streambuf_type* __sb)
   // filebuf-> NULL 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc
index d4b5da9..2da361b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/3.cc
@@ -25,15 +25,12 @@
 void test04()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   wistringstream istr(L"inside betty carter");
   wostringstream ostr;
   ostr << istr.rdbuf() << endl;
 
   if (ostr.rdstate() & ios_base::eofbit) 
-    test = false;
-
-  VERIFY( test );
+    VERIFY( false );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc
index b47a934..d911ce6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/4.cc
@@ -131,8 +131,6 @@ private:
 
 void test(const std::wstring& str, std::wstreambuf& buf)
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream out;
   std::wistream in(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc
index 0e20e81..1a6ac2e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/5.cc
@@ -38,8 +38,6 @@ std::ios_base& func3(std::ios_base&)
 template<typename T>
 void test(T& (*f)(T&))
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::sync_wstreambuf buf;
   std::wostream os(&buf);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9318-out.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9318-out.cc
index 8a1d5d3..72bcfdc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9318-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9318-out.cc
@@ -46,8 +46,6 @@ private:
 
 void test10()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstringbuf sbuf(L"Bad Moon Rising", std::wios::in);
   Outbuf buf;
   std::wostream stream(&buf);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9424-out.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9424-out.cc
index 4229f86..acdcb1e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9424-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9424-out.cc
@@ -87,8 +87,6 @@ const wchar_t Inbuf_2::buf[] = L"Atteivlis";
 
 void test12()
 { 
-  bool test __attribute__((unused)) = true;
- 
   Outbuf_2 outbuf2;
   std::wostream os (&outbuf2);
   Inbuf_2 inbuf2;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9555-oo.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9555-oo.cc
index 9a72565..f073737 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9555-oo.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/9555-oo.cc
@@ -29,7 +29,6 @@ struct buf: std::wstreambuf
 template<typename T>
 void testthrow(T arg)
 {
-  bool test __attribute__((unused)) = true;
   buf b;
   std::wostream os(&b);
   os.exceptions(std::wios::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc
index 419fff7..bb3c1a3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc
@@ -29,7 +29,6 @@
 void test()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wchar_t buf[64];
   error_code e1;
@@ -42,14 +41,14 @@ void test()
     s1 = ostr.str();
 
     if (ostr.rdstate() & ios_base::eofbit) 
-      test = false;
+      VERIFY( false );
   }
-  VERIFY( test );
+
   VERIFY( find(s1.begin(), s1.end(), L':') != s1.end() );
 
   swprintf(buf, 64, L"%i", e1.value());
   s = buf;
-  VERIFY( s1.find(s) != string::npos);
+  VERIFY( s1.find(s) != string::npos );
 
   {
     wostringstream ostr;
@@ -57,14 +56,14 @@ void test()
     s2 = ostr.str();
 
     if (ostr.rdstate() & ios_base::eofbit) 
-      test = false;
+      VERIFY( false );
   }
-  VERIFY( test );
+
   VERIFY( find(s2.begin(), s2.end(), L':') != s2.end() );
 
   swprintf(buf, 64, L"%i", e2.value());
   s = buf;
-  VERIFY( s2.find(s) != string::npos);
+  VERIFY( s2.find(s) != string::npos );
 }
 
 int 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_failbit.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_failbit.cc
index 69fc5a3..a8dbeb3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_failbit.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_failbit.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test5()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bob;
   wostream stream(&bob);
   wstringbuf sbuf(L"Foo, bar, qux", ios_base::in);
@@ -39,7 +38,6 @@ void test5()
 
 void test7()
 {
-  bool test __attribute__((unused)) = true;
   wostringstream stream;
   __gnu_test::fail_wstreambuf bib;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_badbit_throw.cc
index 39a7b94..dc4a1b7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test13()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bob;
   wostream stream(&bob);
   stream.exceptions(ios_base::badbit);
@@ -45,7 +44,6 @@ void test13()
 
 void test15()
 {
-  bool test __attribute__((unused)) = true;
   wostringstream stream;
   stream.exceptions(ios_base::badbit);
   __gnu_test::fail_wstreambuf bib;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_failbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_failbit_throw.cc
index 4e61dca..9bf8078 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_failbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_failbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test9()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bob;
   wostream stream(&bob);
   stream.exceptions(ios_base::failbit);
@@ -50,7 +49,6 @@ void test9()
 
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   wostringstream stream;
   stream.exceptions(ios_base::failbit);
   __gnu_test::fail_wstreambuf bib;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc
index 1de18ed..ebe4307 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc
@@ -27,7 +27,6 @@
 void test1()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream stream;
   stream << static_cast<wstreambuf*>(0);
@@ -37,7 +36,6 @@ void test1()
 void test3()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wostringstream stream;
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/put/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/put/char/1.cc
index 09a9994..bf599b1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/put/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/put/char/1.cc
@@ -40,8 +40,6 @@ protected:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf buf;
   std::ostream os(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/put/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/put/wchar_t/1.cc
index 553f3d9..1694c27 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/put/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/put/wchar_t/1.cc
@@ -38,8 +38,6 @@ protected:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf buf;
   std::wostream os(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc
index bfa293c..c846e36 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-fstream.cc
@@ -34,8 +34,6 @@ const int times = 10;
 
 void write_rewind(std::iostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   for (int j = 0; j < times; j++) 
     {
       std::streampos begin = stream.tellp();
@@ -50,8 +48,6 @@ void write_rewind(std::iostream& stream)
 
 void check_contents(std::iostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   stream.clear();
   stream.seekg(0, std::ios::beg);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc
index a56b821..0c65dd7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/2346-sstream.cc
@@ -29,8 +29,6 @@ const int times = 10;
 
 void write_rewind(std::iostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   for (int j = 0; j < times; j++) 
     {
       std::streampos begin = stream.tellp();
@@ -45,8 +43,6 @@ void write_rewind(std::iostream& stream)
 
 void check_contents(std::iostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   stream.clear();
   stream.seekg(0, std::ios::beg);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/exceptions_badbit_throw.cc
index 0e912ee..e6d89a3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/char/exceptions_badbit_throw.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   __gnu_test::fail_streambuf bib;
   ostream stream(&bib);
@@ -54,7 +53,6 @@ void test01()
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   __gnu_test::fail_streambuf bib;
   ostream stream(&bib);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc
index 55daea6..c3df3306 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-fstream.cc
@@ -32,8 +32,6 @@ const int times = 10;
 
 void write_rewind(std::wiostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   for (int j = 0; j < times; j++) 
     {
       std::streampos begin = stream.tellp();
@@ -48,8 +46,6 @@ void write_rewind(std::wiostream& stream)
 
 void check_contents(std::wiostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   stream.clear();
   stream.seekg(0, std::wios::beg);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc
index 634073b..faa4262 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/2346-sstream.cc
@@ -27,8 +27,6 @@ const int times = 10;
 
 void write_rewind(std::wiostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   for (int j = 0; j < times; j++) 
     {
       std::streampos begin = stream.tellp();
@@ -43,8 +41,6 @@ void write_rewind(std::wiostream& stream)
 
 void check_contents(std::wiostream& stream)
 {
-  bool test __attribute__((unused)) = true;
-
   stream.clear();
   stream.seekg(0, std::wios::beg);
   int i = 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/exceptions_badbit_throw.cc
index 9320be8..da6dd51 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/seekp/wchar_t/exceptions_badbit_throw.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   __gnu_test::fail_wstreambuf bib;
   wostream stream(&bib);
@@ -54,8 +53,7 @@ void test01()
 void test02()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
-  
+ 
   __gnu_test::fail_wstreambuf bib;
   wostream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/1.cc
index 96839b0..46b3a82 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/1.cc
@@ -28,8 +28,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::stringbuf strbuf01;
   std::ostream strm1(&strbuf01);
   const std::ostream::sentry sentry1(strm1);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/2.cc
index c11213c..af078a8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/2.cc
@@ -43,8 +43,6 @@ struct buf : std::streambuf
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   buf b(0);
   std::ostream strm(&b);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
index 1731159..602ea76 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
@@ -35,9 +35,6 @@ void test01()
   typedef basic_stringbuf<pod_ushort> 	stringbuf_type;
   typedef basic_ostream<pod_ushort> 	ostream_type;
 
-  bool test __attribute__((unused)) = true;
-
-
   const string_type str01;
   stringbuf_type* strbuf01 = 0;
   stringbuf_type strbuf02(str01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc
index 0982fd5..81f1052 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/1.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstringbuf strbuf01;
   std::wostream strm1(&strbuf01);
   const std::wostream::sentry sentry1(strm1);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc
index 5554f74..1d6f6d3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/wchar_t/2.cc
@@ -41,8 +41,6 @@ struct buf : std::wstreambuf
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   buf b(0);
   std::wostream strm(&b);
   
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/1.cc
index 8f65916..105cc94 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/1.cc
@@ -32,7 +32,6 @@ void test01()
   typedef ios::off_type off_type;
   typedef ios::pos_type pos_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = "ostream_seeks-1.txt";
 
   // out
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/2.cc
index 505c173..e3b3dcd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/2.cc
@@ -27,7 +27,6 @@ void test01()
   using namespace std;
   typedef std::stringbuf::pos_type        pos_type;
   typedef std::stringbuf::off_type        off_type;
-  bool test __attribute__((unused)) = true;
 
   // tellp
   ostringstream ost;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/exceptions_badbit_throw.cc
index 13628e9..39162c9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/char/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_streambuf bib;
   ostream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc
index 4d26fef..a9b8240 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/1.cc
@@ -30,7 +30,6 @@ void test01()
   typedef wios::off_type off_type;
   typedef wios::pos_type pos_type;
 
-  bool test __attribute__((unused)) = true;
   const char str_lit01[] = "wostream_seeks-1.txt";
 
   // out
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc
index 4efdb96..5d4c5bf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/2.cc
@@ -25,7 +25,6 @@ void test01()
   using namespace std;
   typedef std::wstringbuf::pos_type        pos_type;
   typedef std::wstringbuf::off_type        off_type;
-  bool test __attribute__((unused)) = true;
 
   // tellp
   wostringstream ost;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/exceptions_badbit_throw.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/exceptions_badbit_throw.cc
index a68af1d..7b9efd8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/exceptions_badbit_throw.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/tellp/wchar_t/exceptions_badbit_throw.cc
@@ -26,7 +26,6 @@ using namespace std;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::fail_wstreambuf bib;
   wostream stream(&bib);
   stream.exceptions(ios_base::badbit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/write/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/write/char/1.cc
index ac856e6..c41e37a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/write/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/write/char/1.cc
@@ -41,8 +41,6 @@ protected:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   Buf buf;
   std::ostream os(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/write/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/write/wchar_t/1.cc
index 06789cc..bc7fc97 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/write/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/write/wchar_t/1.cc
@@ -39,8 +39,6 @@ protected:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   Buf buf;
   std::wostream os(&buf);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/2020.cc
index cbda4ae..216785e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_ostringstream<__gnu_test::pod_ushort> gnu_osstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/3.cc
index 1c6ef3d..c3ac128 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/3.cc
@@ -26,14 +26,12 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = false;
-
   // Empty string sanity check.
   std::string str01;
   std::string::iterator __i_start = str01.begin();
   std::string::iterator __i_end = str01.end();
   std::string::size_type len = str01.size();
-  test = __i_start == __i_end;
+  VERIFY( __i_start == __i_end );
   VERIFY( len == 0 );
 
   // Full string sanity check.
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc
index 86d3076..af82b4a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/3.cc
@@ -24,14 +24,12 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = false;
-
   // Empty string sanity check.
   std::wstring str01;
   std::wstring::iterator __i_start = str01.begin();
   std::wstring::iterator __i_end = str01.end();
   std::wstring::size_type len = str01.size();
-  test = __i_start == __i_end;
+  VERIFY( __i_start == __i_end );
   VERIFY( len == 0 );
 
   // Full string sanity check.
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
index 9c9ac35..cf78db5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
@@ -33,7 +33,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
index 7a73bc2..8f0ac4d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
@@ -31,7 +31,6 @@ active_buffer(std::wios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* strlit01 = L"fuck war";
   const std::wstring str00;
   const std::wstring str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/1.cc
index 8b8fda6..ac8756d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/1.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::ostringstream os01;
   const std::string str00; 
   const std::string str01 = "123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/2.cc
index 5a55e4e..4273ac2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/char/2.cc
@@ -32,7 +32,6 @@ public:
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
   derived_oss yy;
   yy << "buena vista social club\n";
   VERIFY( yy.str() == std::string("buena vista social club\n") );
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc
index 4000c73..eb176ae 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/1.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::wostringstream os01;
   const std::wstring str00; 
   const std::wstring str01 = L"123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc
index 2d24db8..ee66d63 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/str/wchar_t/2.cc
@@ -30,7 +30,6 @@ public:
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
   derived_oss yy;
   yy << L"buena vista social club\n";
   VERIFY( yy.str() == std::wstring(L"buena vista social club\n") );
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/2020.cc
index c69a637..b5e97cd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/2020.cc
@@ -31,14 +31,11 @@ class gnu_sbuf: public std::basic_streambuf<__gnu_test::pod_ushort>
 
 void test07()
 {
-  bool test __attribute__((unused)) = true;
-  
   try
     { gnu_sbuf obj; }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc
index b0126ba..580e71f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc
@@ -47,8 +47,6 @@ struct streambuf : std::streambuf
 
 void streambuf::test_copy() const
 {
-  bool test __attribute__((unused)) = true;
-
   streambuf a(*this);
 
   VERIFY( eback()  == a.eback() );
@@ -62,8 +60,6 @@ void streambuf::test_copy() const
 
 void streambuf::test_assign() const
 {
-  bool test __attribute__((unused)) = true;
-
   streambuf a;
   a = *this;
 
@@ -78,8 +74,6 @@ void streambuf::test_assign() const
 
 void streambuf::test_swap() const
 {
-  bool test __attribute__((unused)) = true;
-
   streambuf a(*this);
   streambuf b;
   const streambuf c(b);
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc
index f212462..0299455 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/char/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::constraint_streambuf buf01;
 
   // 27.5.2.1 basic_streambuf ctors
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc
index f62f282..6e597d7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/wchar_t/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   __gnu_test::constraint_wstreambuf buf01;
 
   // 27.5.2.1 basic_streambuf ctors
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc
index efb7a38..1a735ce 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc
@@ -33,8 +33,6 @@ protected:
 // libstdc++/13007
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   Buf1 buf;
   std::locale loc(std::locale("is_IS.UTF-8"));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc
index 5aba669..68bf14c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc
@@ -43,8 +43,6 @@ protected:
 // libstdc++/13007
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf2 buf;
   std::locale loc(std::locale(ISO_8859(1,en_US)));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc
index 880fdef..43155f9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc
@@ -39,7 +39,6 @@ public:
 void test08()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc;
   testbuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc
index d6c77eb..4359085 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc
@@ -33,8 +33,6 @@ protected:
 // libstdc++/13007
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   Buf1 buf;
   std::locale loc(std::locale("is_IS.UTF-8"));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc
index 8f72cb2..6727778 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc
@@ -43,8 +43,6 @@ protected:
 // libstdc++/13007
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   Buf2 buf;
   std::locale loc(std::locale(ISO_8859(1,en_US)));
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc
index 51eb3c6..83982b0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc
@@ -39,7 +39,6 @@ public:
 void test08()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc;
   testbuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/char/1.cc
index 2b0e8f2..a21ef93 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/char/1.cc
@@ -37,7 +37,6 @@ void test05()
   typedef streambuf_type::off_type 	off_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   std::streamoff  			strmof_1;
   testbuf	sb01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc
index 64cf9ce..f58fdae 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/in_avail/wchar_t/1.cc
@@ -37,7 +37,6 @@ void test05()
   typedef streambuf_type::off_type 	off_type;
   typedef size_t 			size_type;
 
-  bool test __attribute__((unused)) = true;
   std::streamoff  			strmof_1;
   testbuf	sb01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc
index 71f1577..83eefbb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::streambuf() 
   { }
 
-  bool
+  void
   check_pointers()
   { 
-    bool test __attribute__((unused)) = true;
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,7 +82,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   char lit01[52];
   std::strcpy(lit01, "chicago underground trio/possible cube on delmark");
   testbuf buf01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/2.cc
index c08b804..04e447f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/2.cc
@@ -52,7 +52,6 @@ template<typename T>
 
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
   const std::string control01("11111");
   std::string test01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/3599.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/3599.cc
index 5e99f62..e769836 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/3599.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/char/3599.cc
@@ -41,7 +41,6 @@ protected:
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   testbuf ob;
   std::ostream out(&ob); 
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc
index 0feb4e1..bbd97a3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::wstreambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,7 +82,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   wchar_t lit01[52];
   std::wcscpy(lit01, L"chicago underground trio/possible cube on delmark");
   testbuf buf01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc
index 672a393..a9ebffa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/2.cc
@@ -52,7 +52,6 @@ template<typename T>
 
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring control01(L"11111");
   std::wstring test01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc
index fd5bff5..ce35a61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/overflow/wchar_t/3599.cc
@@ -41,7 +41,6 @@ protected:
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   testbuf ob;
   std::wostream out(&ob); 
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc
index b59f50d..34defa9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/char/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::streambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,7 +82,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   char lit01[52];
   std::strcpy(lit01, "chicago underground trio/possible cube on delmark");
   testbuf buf01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc
index 83b9fe7..dc24354 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::wstreambuf() 
   { }
 
-  bool
+  void
   check_pointers()
   { 
-    bool test __attribute__((unused)) = true;
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,7 +82,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   wchar_t lit01[52];
   std::wcscpy(lit01, L"chicago underground trio/possible cube on delmark");
   testbuf buf01;
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc
index 24242b5..37b4fae 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/char/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::streambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,8 +82,6 @@ void test02()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
-
   char lit01[] = "chicago underground trio/possible cube on delmark";
   size_t i01 = traits_type::length(lit01);
 
@@ -95,7 +91,7 @@ void test02()
   // default ctor initializes 
   // - all pointer members to null pointers
   // - locale to current global locale
-  VERIFY( buf01.check_pointers() );
+  buf01.check_pointers();
   VERIFY( buf01.getloc() == std::locale() );
 
   // 27.5.2.2.5 Put area
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc
index b4e5d16..a75f613 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::wstreambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,8 +82,6 @@ void test02()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
-
   wchar_t lit01[] = L"chicago underground trio/possible cube on delmark";
   size_t i01 = traits_type::length(lit01);
 
@@ -95,7 +91,7 @@ void test02()
   // default ctor initializes 
   // - all pointer members to null pointers
   // - locale to current global locale
-  VERIFY( buf01.check_pointers() );
+  buf01.check_pointers();
   VERIFY( buf01.getloc() == std::locale() );
 
   // 27.5.2.2.5 Put area
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc
index fcf433c..9ff6aa1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/char/9538.cc
@@ -29,7 +29,6 @@ class MyTraits : public std::char_traits<char>
 public:
   static bool eq(char c1, char c2)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( c1 != 'X' );
     VERIFY( c2 != 'X' );
     return std::char_traits<char>::eq(c1, c2);
@@ -52,8 +51,6 @@ public:
 // libstdc++/9538
 void test08()
 {
-  bool test __attribute__((unused)) = true;
-
   MyBuf mb;
   mb.sputbackc('a');  
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc
index 6a2bf116..e5770fc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputbackc/wchar_t/9538.cc
@@ -29,7 +29,6 @@ class MyTraits : public std::char_traits<wchar_t>
 public:
   static bool eq(wchar_t c1, wchar_t c2)
   {
-    bool test __attribute__((unused)) = true;
     VERIFY( c1 != L'X' );
     VERIFY( c2 != L'X' );
     return std::char_traits<wchar_t>::eq(c1, c2);
@@ -52,8 +51,6 @@ public:
 // libstdc++/9538
 void test08()
 {
-  bool test __attribute__((unused)) = true;
-
   MyBuf mb;
   mb.sputbackc(L'a');
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc
index f62d0c8..cf71df4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/char/1.cc
@@ -35,17 +35,15 @@ public:
   testbuf(): std::streambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -84,7 +82,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   testbuf buf01;
 
   // sputn/xsputn
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc
index 6df8289..8dbd72d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc
@@ -36,17 +36,15 @@ public:
   testbuf(): std::wstreambuf() 
   { }
 
-  bool
+  void
   check_pointers()
-  { 
-    bool test __attribute__((unused)) = true;
+  {
     VERIFY( !this->eback() );
     VERIFY( !this->gptr() );
     VERIFY( !this->egptr() );
     VERIFY( !this->pbase() );
     VERIFY( !this->pptr() );
     VERIFY( !this->epptr() );
-    return test;
   }
 
   int_type 
@@ -85,7 +83,6 @@ void test01()
   typedef testbuf::traits_type traits_type;
   typedef testbuf::int_type int_type;
 
-  bool test __attribute__((unused)) = true;
   testbuf buf01;
 
   // sputn/xsputn
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/char/1057.cc
index e0215c1..a5cd3f9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/char/1057.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/char/1057.cc
@@ -68,7 +68,6 @@ public:
 // libstdc++/1057
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   std::string text = "abcdefghijklmn";
   
   // 01
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc
index bd12ae8..fba0fe8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/sync/wchar_t/1057.cc
@@ -68,7 +68,6 @@ public:
 // libstdc++/1057
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring text = L"abcdefghijklmn";
   
   // 01
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/2020.cc
index 9af1404..06f4163 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/2020.cc
@@ -28,15 +28,13 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_stringbuf<__gnu_test::pod_ushort> gnu_ssbuf;
   
   try
     { gnu_ssbuf obj; }
   catch(std::exception& obj)
-    { 
-      test = false; 
-      VERIFY( test );
+    {
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/1.cc
index 9412d0f..2c3643b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/char/1.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-09/msg00243.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::constraint_stringbuf sbuf;
   VERIFY( sbuf.check_pointers() );
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc
index 2afae81..6efc1b1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/cons/wchar_t/1.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/libstdc++/2004-09/msg00243.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   __gnu_test::constraint_wstringbuf sbuf;
   VERIFY( sbuf.check_pointers() );
 }
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc
index 4ff2eb6..b58033f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc
@@ -26,8 +26,6 @@ std::stringbuf strb_01(str_01);
 // test the streambuf/stringbuf locale settings
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_c = std::locale::classic();
   loc_c = strb_01.getloc();
   strb_01.pubimbue(loc_c); //This should initialize _M_init to true
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
index cd02d69..c92bfd6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
@@ -29,7 +29,6 @@
 void test03()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc =  std::locale::classic();
   std::stringbuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc
index ec9d974..f66cff3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc
@@ -26,8 +26,6 @@ std::wstringbuf strb_01(str_01);
 // test the streambuf/stringbuf locale settings
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_c = std::locale::classic();
   loc_c = strb_01.getloc();
   strb_01.pubimbue(loc_c); //This should initialize _M_init to true
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
index 49e1c4a..c60eef1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
@@ -29,7 +29,6 @@
 void test03()
 {
   using std::locale;
-  bool test __attribute__((unused)) = true;
 
   locale loc =  std::locale::classic();
   std::wstringbuf ob;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc
index 0732e23..10fb4c4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::streamoff  		strmof_1(-1), strmof_2;
 
   // GET
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc
index 511bafd..a720b27 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::streamoff  		strmof_1(-1), strmof_2;
 
   // GET
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc
index 0ef3a83..285eca9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc
@@ -37,8 +37,6 @@ data(unsigned len)
 void
 test01(unsigned iter)
 {
-  bool test __attribute__((unused)) = true;
-
   for (unsigned n = 1; n <= iter; n *= 10)
     {
       const string str = data(n);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/2.cc
index 772f32a..934302f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/2.cc
@@ -51,7 +51,6 @@ template<typename T>
 
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
   const std::string control01("11111");
   std::string test01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/26250.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/26250.cc
index 2430a66..f6cc1c3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/26250.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/26250.cc
@@ -34,8 +34,6 @@ struct pubbuf
 // libstdc++/26250
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   pubbuf buf;
 
   VERIFY( buf.overflow('x') == 'x' );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/3599.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/3599.cc
index dffd4d7..ca08931 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/3599.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/3599.cc
@@ -39,7 +39,6 @@ protected:
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   testbuf ob;
   std::ostream out(&ob); 
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/9988.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/9988.cc
index 67f92e6..b44a679 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/9988.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/9988.cc
@@ -34,7 +34,6 @@ public:
 void test15()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   OverBuf sb;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc
index 6998230..2f0afbc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc
@@ -43,8 +43,6 @@ data(unsigned len)
 void
 test01(unsigned iter)
 {
-  bool test __attribute__((unused)) = true;
-
   for (unsigned n = 1; n <= iter; n *= 10)
     {
       const wstring str = data(n);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc
index babbbbd..c09e0dd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/2.cc
@@ -51,7 +51,6 @@ template<typename T>
 
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring control01(L"11111");
   std::wstring test01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc
index 8894afb..7fc4a16 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/26250.cc
@@ -34,8 +34,6 @@ struct pubbuf
 // libstdc++/26250
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   pubbuf buf;
 
   VERIFY( buf.overflow(L'x') == L'x' );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc
index 8ac954f..39cc9e3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/3599.cc
@@ -39,7 +39,6 @@ protected:
 void
 test07()
 {
-  bool test __attribute__((unused)) = true;
   testbuf ob;
   std::wostream out(&ob); 
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc
index 2e62c62..beefa8d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/9988.cc
@@ -34,7 +34,6 @@ public:
 void test15()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   
   OverBuf sb;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc
index fd3f613..af0eeb1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/1.cc
@@ -35,7 +35,6 @@ public:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef my_stringbuf::int_type    int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc
index 1e7c4d5..6ed963f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/char/2.cc
@@ -37,7 +37,6 @@ public:
 // mode & ios_base::out is nonzero, ..."
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef my_stringbuf::int_type    int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc
index 6521767..f358ac3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/1.cc
@@ -35,7 +35,6 @@ public:
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef my_stringbuf::int_type    int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc
index 318c6df..efa2894 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/pbackfail/wchar_t/2.cc
@@ -37,7 +37,6 @@ public:
 // mode & ios_base::out is nonzero, ..."
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef my_stringbuf::int_type    int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc
index a4a2a4c..66783b9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc
index 79eaea5..b6345f0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/9825.cc
@@ -27,7 +27,6 @@
 void test12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf sbuf;
   sbuf.sputn("crazy bees!", 11);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc
index fb04f5a..3c45fa2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc
index 7a0d544..9e1b5d0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/9825.cc
@@ -27,7 +27,6 @@
 void test12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf sbuf;
   sbuf.sputn(L"crazy bees!", 11);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc
index 266306f..37aa5fa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/1.cc
@@ -26,7 +26,6 @@ std::stringbuf strb_01(str_01);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::stringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc
index ee9f6ed..c134959 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/10975.cc
@@ -25,7 +25,6 @@
 // libstdc++/10975
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc
index 7f883aa..2d48ee3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/16956.cc
@@ -25,7 +25,6 @@
 // libstdc++/16956
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef stringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/2.cc
index ba86e97..d9f3702 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/char/2.cc
@@ -24,7 +24,6 @@
 
 void test02(std::stringbuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc
index c197f25..f4d74f6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/1.cc
@@ -26,7 +26,6 @@ std::wstringbuf strb_01(str_01);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::wstringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc
index 4a31995..e08b0ef 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/10975.cc
@@ -25,7 +25,6 @@
 // libstdc++/10975
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef wstreambuf::pos_type pos_type;
   typedef wstreambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc
index 9103752..a6b4f31 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/16956.cc
@@ -25,7 +25,6 @@
 // libstdc++/16956
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef wstringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc
index b2d90cd..5e20481 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekoff/wchar_t/2.cc
@@ -24,7 +24,6 @@
 
 void test02(std::wstringbuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef wstreambuf::pos_type pos_type;
   typedef wstreambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/1.cc
index 12d6da4..f35882d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/1.cc
@@ -26,7 +26,6 @@ std::stringbuf strb_01(str_01);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::pos_type pos_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/2.cc
index 85da8c3..fb48399 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/2.cc
@@ -24,7 +24,6 @@
 
 void test02(std::stringbuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef streambuf::pos_type pos_type;
   typedef streambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc
index e829144..a534173 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/29354.cc
@@ -21,7 +21,6 @@
 // libstdc++/29354
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef stringbuf::pos_type pos_type;
   typedef stringbuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/3.cc
index d653a51..fd839cc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/char/3.cc
@@ -22,7 +22,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef stringbuf::pos_type pos_type;
   typedef stringbuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc
index 7b512f6..f100fef 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/1.cc
@@ -26,7 +26,6 @@ std::wstringbuf strb_01(str_01);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::pos_type pos_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc
index 2d4ab6d..9bfd3a8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/2.cc
@@ -24,7 +24,6 @@
 
 void test02(std::wstringbuf& in, bool pass)
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef wstreambuf::pos_type pos_type;
   typedef wstreambuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc
index 6018ed2..e5c5e63 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/29354.cc
@@ -21,7 +21,6 @@
 // libstdc++/29354
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef stringbuf::pos_type pos_type;
   typedef stringbuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc
index a59c05f..f715cf4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/seekpos/wchar_t/3.cc
@@ -22,7 +22,6 @@
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   typedef wstringbuf::pos_type pos_type;
   typedef wstringbuf::off_type off_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc
index 98a8c47..9796b24 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc
@@ -28,7 +28,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp;
 
   // PUT
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/2.cc
index 8af4f6a..16b8ff6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/2.cc
@@ -27,7 +27,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::strlen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/3.cc
index 3dae1bf..185973d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/3.cc
@@ -27,7 +27,6 @@ void test02()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::strlen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/4.cc
index fae77c0..eaf9ed7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/4.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const unsigned max_size = 1 << 18;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc
index e8acad6..0ec0d0e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc
@@ -28,7 +28,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp;
 
   // PUT
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc
index 27ecf75..c0280c9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/2.cc
@@ -26,7 +26,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   wchar_t buf[512];
   const wchar_t* strlit = L"how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::wcslen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc
index 965044e..0bc0bd4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/3.cc
@@ -26,7 +26,6 @@ void test02()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   wchar_t buf[512];
   const wchar_t* strlit = L"how to tell a story and other essays: mark twain";
   const size_t strlitsize = std::wcslen(strlit);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc
index baa7c5c..b3318e8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc
@@ -31,7 +31,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   const unsigned max_size = MAX_SIZE;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc
index 3da7369..321d673 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc
index a4f6580..e60b494 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc
index 6a7da05..4065b36 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
@@ -66,7 +65,7 @@ void test04()
   // approp and returning the number of chars assigned
   strmsz_1 = strb_01.in_avail();
   strmsz_2 = strb_02.in_avail();
-  test = strmsz_1 != strmsz_2;
+  VERIFY( strmsz_1 != strmsz_2 );
   VERIFY( strmsz_1 != static_cast<std::streamsize>(str_01.length()) );
   // because now we've moved into string
   VERIFY( strmsz_2 != static_cast<std::streamsize>(str_02.length()) ); 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc
index 11bec77..7eaea1e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
@@ -66,7 +65,7 @@ void test04()
   // approp and returning the number of chars assigned
   strmsz_1 = strb_01.in_avail();
   strmsz_2 = strb_02.in_avail();
-  test = strmsz_1 != strmsz_2;
+  VERIFY( strmsz_1 != strmsz_2 );
   VERIFY( strmsz_1 != static_cast<std::streamsize>(str_01.length()) );
   // because now we've moved into string
   VERIFY( strmsz_2 != static_cast<std::streamsize>(str_02.length()) ); 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc
index 8ff6ab4d..3551dbf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc
index b48c115..fbeeffb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc
index d42bce6..94e0420 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp, str_tmp2;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc
index 3db3bbb..60b7613 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/9425.cc
@@ -28,7 +28,6 @@
 void test09()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   stringbuf sbuf;
   stringbuf::int_type r = sbuf.sputbackc('a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc
index b49ef72..aad8054 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp, str_tmp2;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc
index 3bfdf63..ca91a04 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/9425.cc
@@ -28,7 +28,6 @@
 void test09()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstringbuf sbuf;
   wstringbuf::int_type r = sbuf.sputbackc(L'a');
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc
index d27a869..160c329 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc
index 260469e..2bc32fe 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/9404-1.cc
@@ -47,8 +47,6 @@ public:
 // libstdc++/9404
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
 
   // sputc
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc
index 068b9c9..a05b2b0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc
index 3dc0182..9319b86 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/9404-1.cc
@@ -47,8 +47,6 @@ public:
 // libstdc++/9404
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
 
   // sputc
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc
index 75023bc..04b30a4 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::stringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc
index 8bb3080..3a32c2d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/9404-2.cc
@@ -47,8 +47,6 @@ public:
 // libstdc++/9404
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
   Derived_stringbuf dsbuf_01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc
index e3ac4eb..fa82201 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp;
   std::streamsize 		strmsz_1, strmsz_2;
   typedef std::wstringbuf::int_type int_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc
index c0d3939..5f1b7c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/9404-2.cc
@@ -47,8 +47,6 @@ public:
 // libstdc++/9404
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   bool over_expected;
   Derived_stringbuf dsbuf_01;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/1.cc
index b0ae99f..20a0ca3 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/1.cc
@@ -30,8 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test member functions
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
-
   //stringbuf::str()
   VERIFY( strb_01.str() == str_01 );
   VERIFY( strb_02.str() == str_02 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/2.cc
index 446ed65..f7bd2aa 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/2.cc
@@ -25,8 +25,6 @@
 // which didn't notice the grow.
 void test07()
 {
-  bool test __attribute__((unused)) = true;
-
   std::stringbuf strb_01;
   strb_01.sputc('s');
   strb_01.pubseekoff(0, std::ios_base::beg);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3.cc
index 4f7cdc1..95503eb 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3.cc
@@ -22,8 +22,6 @@
 
 void test06()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream os ("foo", std::ios_base::app);
   os << "bar";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3955.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3955.cc
index 2893f1f..cea95b2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3955.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/char/3955.cc
@@ -23,8 +23,6 @@
 // libstdc++/3955 -- ios_base::app overwrites from the beginning
 void test05()
 {
-  bool test __attribute__((unused)) = true;
-
   std::ostringstream os ("foo");
   os << "bar";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc
index 45e5180d..4ccaeec 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/1.cc
@@ -30,8 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test member functions
 void test03() 
 {
-  bool test __attribute__((unused)) = true;
-
   // stringbuf::str()
   VERIFY( strb_01.str() == str_01 );
   VERIFY( strb_02.str() == str_02 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc
index dc788d0..6ef88c6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/2.cc
@@ -25,8 +25,6 @@
 // which didn't notice the grow.
 void test07()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wstringbuf strb_01;
   strb_01.sputc(L's');
   strb_01.pubseekoff(0, std::ios_base::beg);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc
index 9951baa..24e8227 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3.cc
@@ -22,8 +22,6 @@
 
 void test06()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream os (L"foo", std::ios_base::app);
   os << L"bar";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc
index a2cf4ee..aa0cc6a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/str/wchar_t/3955.cc
@@ -23,8 +23,6 @@
 // libstdc++/3955 -- ios_base::app overwrites from the beginning
 void test05()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wostringstream os (L"foo");
   os << L"bar";
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc
index 2a7ab7a..f5ee114 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc
@@ -30,7 +30,6 @@ std::stringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::string 		str_tmp;
   typedef std::stringbuf::int_type int_type;
   typedef std::stringbuf::traits_type traits_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc
index 4a18b04..6871588 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc
@@ -30,7 +30,6 @@ std::wstringbuf strb_03(str_03, std::ios_base::out);
 // test overloaded virtual functions
 void test04() 
 {
-  bool test __attribute__((unused)) = true;
   std::wstring 		str_tmp;
   typedef std::wstringbuf::int_type int_type;
   typedef std::wstringbuf::traits_type traits_type;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/char/1057.cc
index 7ed5fc4..d099b2b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/char/1057.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/char/1057.cc
@@ -67,7 +67,6 @@ public:
 // libstdc++/1057
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   std::string text = "abcdefghijklmn";
   
   // 01
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc
index 3bbd32c..6fcedbf 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sync/wchar_t/1057.cc
@@ -67,7 +67,6 @@ public:
 // libstdc++/1057
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   std::wstring text = L"abcdefghijklmn";
   
   // 01
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/2020.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/2020.cc
index 6903bfe..277b33a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/2020.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/2020.cc
@@ -28,7 +28,6 @@
 // should be able to use custom char_type, custom traits type
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::basic_stringstream<__gnu_test::pod_ushort> gnu_sstr;
 
   try
@@ -37,8 +36,7 @@ void test07()
     }
   catch(std::exception& obj)
     { 
-      test = false; 
-      VERIFY( test );
+      VERIFY( false );
     }
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc
index 925e5c5..5c30084 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/char/2832.cc
@@ -33,7 +33,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::stringbuf sbuf;
   std::streambuf* pbasebuf0 = &sbuf;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc
index 23be4b68..a6c2b9c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/rdbuf/wchar_t/2832.cc
@@ -31,7 +31,6 @@ active_buffer(std::wios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::wstringbuf sbuf;
   std::wstreambuf* pbasebuf0 = &sbuf;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
index d989a00..3e31378 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
@@ -24,7 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::stringstream is01;
   const std::string str00; 
   const std::string str01 = "123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
index 546506c..9ce8ebd 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
@@ -33,7 +33,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const char* strlit01 = "fuck war";
   const std::string str00;
   const std::string str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/3.cc
index 95bd125..8d6613f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/3.cc
@@ -25,8 +25,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   //
   // 1: Automatic formatting of a compound string
   //
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/4.cc
index f39253c..ae5cf82 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/4.cc
@@ -25,8 +25,6 @@
 // libstdc++/8466
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const char* strlit00 = "orvieto";
   const std::string str00 = strlit00;
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
index f51113d..7b06770 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::wstringstream is01;
   const std::wstring str00; 
   const std::wstring str01 = L"123";
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
index cade463..689d054 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
@@ -31,7 +31,6 @@ active_buffer(std::wios& stream)
 // libstdc++/2832
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t* strlit01 = L"fuck war";
   const std::wstring str00;
   const std::wstring str01(strlit01);
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/3.cc
index d1eaddc..dbc009a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/3.cc
@@ -23,8 +23,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   //
   // 1: Automatic formatting of a compound string
   //
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/4.cc
index b814876..9263596 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/4.cc
@@ -23,8 +23,6 @@
 // libstdc++/8466
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const wchar_t* strlit00 = L"orvieto";
   const std::wstring str00 = strlit00;
 
diff --git a/libstdc++-v3/testsuite/27_io/fpos/11450.cc b/libstdc++-v3/testsuite/27_io/fpos/11450.cc
index 366d6f1..9d8463d 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/11450.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/11450.cc
@@ -23,8 +23,6 @@
 // libstdc++/11450
 void test01()
 {
-  bool test __attribute__((unused)) = true;  
-
   std::fpos<int> p;
   VERIFY( p.state() == 0 );
   p.state(42);
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14252.cc b/libstdc++-v3/testsuite/27_io/fpos/14252.cc
index 3ce7511..f51e3c1 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14252.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14252.cc
@@ -26,8 +26,6 @@
 // libstdc++/14252
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::streamoff off01 = 10;
   std::streamoff off02 = 2;
   std::streamoff off03 = 2004;
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc
index 5b348ec..4a1eadd 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14320-1.cc
@@ -30,7 +30,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef istreambuf_iterator<char>::difference_type Distance;
 
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-2.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-2.cc
index ee2b8da..771ae58 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14320-2.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14320-2.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;  
 
   typedef istreambuf_iterator<char>::difference_type Distance;
   typedef numeric_limits<Distance> Limits;
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-3.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-3.cc
index 2cfb4a5..7530bf2 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14320-3.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14320-3.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef std::istreambuf_iterator<char>::difference_type Distance;
   Distance d = 2;
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-4.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-4.cc
index 6de0d0d..8201711 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14320-4.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14320-4.cc
@@ -36,7 +36,6 @@ void barney(Fred)
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef istreambuf_iterator<char>::difference_type Distance;
   
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14320-5.cc b/libstdc++-v3/testsuite/27_io/fpos/14320-5.cc
index d3d71da..5f13882 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14320-5.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14320-5.cc
@@ -27,7 +27,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef istreambuf_iterator<char>::difference_type Distance;
 	
diff --git a/libstdc++-v3/testsuite/27_io/fpos/14775.cc b/libstdc++-v3/testsuite/27_io/fpos/14775.cc
index ea0fcd2..ef0bfa9 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/14775.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/14775.cc
@@ -29,7 +29,6 @@ void test01()
 {
 #if defined (_GLIBCXX_USE_LFS) && defined (_GLIBCXX_HAVE_LIMIT_FSIZE)
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   typedef filebuf::pos_type 	pos_type;
   typedef filebuf::off_type 	off_type;
diff --git a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/1.cc b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/1.cc
index 0eff1f9..72030e7 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/1.cc
@@ -27,8 +27,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::mbstate_t state_type;
   state_type state01 = state_type();
   state_type state02 = state_type();
@@ -47,8 +45,7 @@ void test01()
   // place.
   pos01.state(state02);
   state01 = pos01.state();
-  test = std::memcmp(&state01, &state02, sizeof(state_type)) == 0;
-  VERIFY( test );
+  VERIFY( std::memcmp(&state01, &state02, sizeof(state_type)) == 0 );
 }
 
 int main() 
diff --git a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/12065.cc b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/12065.cc
index e5d202e..12b51d9 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/12065.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/12065.cc
@@ -24,8 +24,6 @@
 // libstdc++/12065
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::streampos p(0);
   const std::streampos q(0);
   std::streamoff o(0);
diff --git a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/2.cc b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/2.cc
index ce312b8..720914c 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/2.cc
@@ -27,8 +27,6 @@
 // 27.4.3.2 fpos requirements/invariants
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::mbstate_t state_type;
 
   std::streamoff off01;
diff --git a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/3.cc b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/3.cc
index caf2989..ce96cda 100644
--- a/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/3.cc
+++ b/libstdc++-v3/testsuite/27_io/fpos/mbstate_t/3.cc
@@ -26,8 +26,6 @@
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::mbstate_t state_type;
   std::streamoff off01;
   
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/callbacks/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/callbacks/1.cc
index 2d3450c..0336c5c 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/callbacks/1.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/callbacks/1.cc
@@ -40,7 +40,6 @@ callb03(std::ios_base::event,  std::ios_base&, int)
 
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
   std::locale loc("C");
   std::stringbuf 	strbuf01;
   std::ios		ios01(&strbuf01);
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-1.cc b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-1.cc
index e652166..58e8288 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-1.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-1.cc
@@ -28,7 +28,6 @@
 // libstdc++/1972
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight, no water error");
 
   // 1
@@ -48,7 +47,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   std::string s("lack of sunlight error");
   std::range_error x(s);
   
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-2.cc b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-2.cc
index e04499b9..be08617 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-2.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-2.cc
@@ -33,7 +33,6 @@ public:
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   try
     { throw fuzzy_logic(); }
   catch(const fuzzy_logic& obj)
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-3.cc b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-3.cc
index c27cfea..c2febb4 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-3.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-3.cc
@@ -39,7 +39,6 @@ void allocate_on_stack(void)
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
   const std::string s("CA ISO emergency once again:immediate power down");
   const char* strlit1 = "wish I lived in Palo Alto";
   const char* strlit2 = "...or Santa Barbara";
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-big.cc b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-big.cc
index 3d8c21c..1e58f1e 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/failure/what-big.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/failure/what-big.cc
@@ -27,7 +27,6 @@ void test01()
 {
   typedef std::ios_base::failure test_type;
 
-  bool test __attribute__((unused)) = true;
   const std::string xxx(10000, 'x');
   test_type t(xxx);
 #if _GLIBCXX_USE_CXX11_ABI
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
index 7dca611..bb1ce4c 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/state/1.cc
@@ -23,7 +23,6 @@
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   const std::string strue("true");
   const std::string sfalse("false");
   std::string str01;
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc
index 85409a3..4081344 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc
@@ -26,8 +26,6 @@
 // http://gcc.gnu.org/ml/gcc-bugs/2000-12/msg00413.html
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
-  
   using namespace std;
 
   ios::xalloc();
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
index c366f17..f67201f 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
@@ -40,7 +40,6 @@ void operator delete[] (void *p) throw() { operator delete(p); }
 
 int main ()
 {
-  bool test __attribute__((unused)) = true;
   const int i = std::ios::xalloc();
   VERIFY( i >= 0 );
 
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc
index 8b33732..26c19f1 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc
@@ -39,7 +39,7 @@
 // libstdc++/3129
 void test02()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   int max = std::numeric_limits<int>::max() - 1;
   std::stringbuf        strbuf;
   std::ios              ios(&strbuf);
@@ -64,8 +64,7 @@ void test02()
     }
   catch(...)
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }
   VERIFY( v == 0 );
 
@@ -73,7 +72,7 @@ void test02()
   
   // max is different code path from max-1
   v = &test;
-  try 
+  try
     {
       v = ios.pword(std::numeric_limits<int>::max());
     }
@@ -84,8 +83,7 @@ void test02()
     }
   catch(...)
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }
   VERIFY( v == &test );
 
@@ -104,8 +102,7 @@ void test02()
     }
   catch(...)
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }
   VERIFY( l == 0 );
 
@@ -124,11 +121,9 @@ void test02()
     }
   catch(...)
     {
-      test = false;
-      VERIFY( test );
+      VERIFY( false );
     }
   VERIFY( l == 1 );
-
 }
 
 int main(void)
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
index 2775e2d..499f002 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/sync_with_stdio/2.cc
@@ -32,8 +32,6 @@
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-  
   std::stringbuf 	strbuf01;
   std::ios		ios01(&strbuf01);
 
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/1.cc
index b45824e..5902835 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/1.cc
@@ -46,7 +46,6 @@ MyNP::do_falsename() const
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const char lit[] = "1 0\n"
                      "true false\n"
                      ":  true:\n"
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/2.cc
index 590ec46..827abd2 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/char/2.cc
@@ -23,7 +23,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const std::string 	str_blank;
   std::string 	        str_tmp;
   std::stringbuf 	strbuf;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc
index 567a4e2..d8fea6d 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/1.cc
@@ -44,7 +44,6 @@ MyNP::do_falsename() const
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t lit[] = L"1 0\n"
                         L"true false\n"
                         L":  true:\n"
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc
index bb9fe97..7809848 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/adjustfield/wchar_t/2.cc
@@ -23,7 +23,6 @@
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   const std::wstring 	str_blank;
   std::wstring 	        str_tmp;
   std::wstringbuf 	strbuf;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/basefield/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/basefield/char/1.cc
index 26bfa00..2912404 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/basefield/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/basefield/char/1.cc
@@ -42,7 +42,6 @@ MyNP::do_thousands_sep() const
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const char lit[] = "0123 456\n"
                      ": 01 234 567:\n"
                      ":0123 456   :\n"
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/basefield/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/basefield/wchar_t/1.cc
index 2b5a39e..a8561bc 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/basefield/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/basefield/wchar_t/1.cc
@@ -40,7 +40,6 @@ MyNP::do_thousands_sep() const
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   const wchar_t lit[] = L"0123 456\n"
                         L": 01 234 567:\n"
                         L":0123 456   :\n"
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc
index 4331a24..7f26e49 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_de = std::locale(ISO_8859(15,de_DE));
 
   std::istringstream iss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/51288.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/51288.cc
index 0a7c141..3bc88a4 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/51288.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/51288.cc
@@ -25,8 +25,6 @@
 // libstdc++/51288
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_us = std::locale("en_US.UTF-8");
 
   std::istringstream iss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc
index 429c4aa..9f1f1c2 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_de = std::locale(ISO_8859(15,de_DE));
 
   std::wistringstream iss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc
index 9a0b3f3..1a87e50 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/51288.cc
@@ -25,8 +25,6 @@
 // libstdc++/51288
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_us = std::locale("en_US.UTF-8");
 
   std::wistringstream iss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/1.cc
index 20f8f5c..57b1428 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/1.cc
@@ -29,7 +29,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   istringstream iss;
   iss.imbue(loc_c);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
index 42168f2..1a64cc4 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
@@ -30,7 +30,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   locale loc_de = locale("de_DE.UTF-8");
   VERIFY( loc_de != loc_c );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc
index da4646e..717e713 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/1.cc
@@ -29,7 +29,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   wistringstream iss;
   iss.imbue(loc_c);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
index a465650..4422461 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
@@ -31,7 +31,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   locale loc_de = locale("de_DE.UTF-8");
   VERIFY( loc_de != loc_c );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc
index d42bc11..4f2fcd0 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_de = std::locale(ISO_8859(15,de_DE));
 
   std::ostringstream oss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/51288.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/51288.cc
index 848c1d4..aa892b0 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/51288.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/51288.cc
@@ -25,8 +25,6 @@
 // libstdc++/51288
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_us = std::locale("en_US.UTF-8");
 
   std::ostringstream oss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc
index 6d9c9cc..9dde398 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_de = std::locale(ISO_8859(15,de_DE));
 
   std::wostringstream oss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc
index 716d0db..e515878 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/51288.cc
@@ -25,8 +25,6 @@
 // libstdc++/51288
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::locale loc_us = std::locale("en_US.UTF-8");
 
   std::wostringstream oss;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc
index 7b22d73..46b728c9 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc
@@ -29,7 +29,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   ostringstream oss;
   oss.imbue(loc_c);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
index ac74472..fd3b2f8 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
@@ -30,7 +30,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   locale loc_de = locale("de_DE.UTF-8");
   VERIFY( loc_de != loc_c );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc
index c4b22c5..7edb10a 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc
@@ -29,7 +29,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   wostringstream oss;
   oss.imbue(loc_c);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
index 4c32b067..af2fa26 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
@@ -30,7 +30,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   locale loc_c = locale::classic();
   locale loc_de = locale("de_DE.UTF-8");
   VERIFY( loc_de != loc_c );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/1.cc
index 132d17e..0bcd802 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/1.cc
@@ -25,7 +25,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   string s("john coltrane, a love supreme");
   istringstream  iss(s);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc
index 8db7346..cc5505b 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/2.cc
@@ -32,7 +32,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   string x ("   this is text");
   istringstream  sin(x);
   ostringstream  sout;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/dr2344.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/dr2344.cc
index 41e1d69..b7de0df 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/dr2344.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/dr2344.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::ostringstream ssx;
   ssx << "[" << std::left << std::setfill('x') << std::setw(20) << R"("AB \"CD\" EF")" << "]";
   VERIFY( ssx.str() == R"(["AB \"CD\" EF"xxxxxx])" );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/quoted.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/quoted.cc
index 3041d18..540e360 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/char/quoted.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/char/quoted.cc
@@ -28,7 +28,6 @@ void
 test01()
 {
   //  Basic test from paper.
-  bool test [[gnu::unused]] = true;
   std::stringstream ss;
   std::string original = "foolish me";
   std::string round_trip;
@@ -41,7 +40,6 @@ void
 test02()
 {
   //  Test skipws correctness.
-  bool test [[gnu::unused]] = true;
   std::stringstream ss;
   ss << std::quoted("Hello Goodbye") << ' ' << 1 << ' ' << 2;
   std::string song;
@@ -56,7 +54,6 @@ void
 test03()
 {
   //  Test read of unquoted string.
-  bool test [[gnu::unused]] = true;
   std::stringstream ss;
   ss << "Alpha Omega";
   std::string testit;
@@ -68,7 +65,6 @@ auto
 test04(const std::string& message)
 {
   //  Test 'const basic_string&'
-  bool test [[gnu::unused]] = true;
   std::stringstream ss;
   ss << "**  Error: " << std::quoted(message) << "  **";
   return ss.str();
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/1.cc
index 989763d..9c7c978 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/1.cc
@@ -25,7 +25,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   wstring s(L"john coltrane, a love supreme");
   wistringstream  iss(s);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/2.cc
index 825074c..397e0e2 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/2.cc
@@ -32,7 +32,6 @@ void
 test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   wstring x(L"   this is text");
   wistringstream  sin(x);
   wostringstream  sout;
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc
index eeaa93c..4b7dad6 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/dr2344.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test [[gnu::unused]] = true;
-
   std::wostringstream ssx;
   ssx << L"[" << std::left << std::setfill(L'x') << std::setw(20) << LR"("AB \"CD\" EF")" << L"]";
   VERIFY( ssx.str() == LR"(["AB \"CD\" EF"xxxxxx])" );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/quoted.cc b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/quoted.cc
index a9d6973..4297731 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/quoted.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/standard/wchar_t/quoted.cc
@@ -28,7 +28,6 @@ void
 test01()
 {
   //  Basic test from paper.
-  bool test [[gnu::unused]] = true;
   std::wstringstream ss;
   std::wstring original = L"foolish me";
   std::wstring round_trip;
@@ -41,7 +40,6 @@ void
 test02()
 {
   //  Test skipws correctness.
-  bool test [[gnu::unused]] = true;
   std::wstringstream ss;
   ss << std::quoted(L"Hello Goodbye") << L' ' << 1 << L' ' << 2;
   std::wstring song;
@@ -56,7 +54,6 @@ void
 test03()
 {
   //  Test read of unquoted string.
-  bool test [[gnu::unused]] = true;
   std::wstringstream ss;
   ss << L"Alpha Omega";
   std::wstring testit;
@@ -68,7 +65,6 @@ auto
 test04(const std::wstring& message)
 {
   //  Test 'const basic_string&'
-  bool test [[gnu::unused]] = true;
   std::wstringstream ss;
   ss << L"**  Error: " << std::quoted(message) << L"  **";
   return ss.str();
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/1.cc b/libstdc++-v3/testsuite/27_io/objects/char/1.cc
index 6bdc303..bed0b62 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/1.cc
@@ -74,8 +74,6 @@
 // Make sure all the standard streams are defined.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   char array1[20];
   typedef std::ios::traits_type ctraits_type;
   ctraits_type::int_type i = 15;
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/10.cc b/libstdc++-v3/testsuite/27_io/objects/char/10.cc
index 45a9a79..bd7d6a5 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/10.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/10.cc
@@ -28,7 +28,6 @@ void test10()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "filebuf_virtuals-1.txt";
 
   FILE* ret = freopen(name, "r", stdin);
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/3045.cc b/libstdc++-v3/testsuite/27_io/objects/char/3045.cc
index a145caa..baa8135 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/3045.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/3045.cc
@@ -37,7 +37,6 @@ gnu_filebuf buf(initial);
 // libstdc++/3045, in a vague way.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   int k1;
 
   // 1 normal
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/41037.cc b/libstdc++-v3/testsuite/27_io/objects/char/41037.cc
index c77d4f9..0a1b248 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/41037.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/41037.cc
@@ -21,8 +21,6 @@
 // PR libstdc++/41037
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::cerr.flags() & std::ios_base::dec );
   VERIFY( std::cerr.flags() & std::ios_base::skipws );
   VERIFY( std::cerr.flags() & std::ios_base::unitbuf );
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/5.cc b/libstdc++-v3/testsuite/27_io/objects/char/5.cc
index 70c96e4..24abdee 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/5.cc
@@ -68,7 +68,6 @@ int use_standard_streams()
 
 void test05()
 {
-  bool test __attribute__((unused)) = true;
   int i = static_ob.i;
 
   VERIFY( std::cin.iword(i) == i + 1 );
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/6.cc b/libstdc++-v3/testsuite/27_io/objects/char/6.cc
index 96207b4..247ba04 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/6.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/6.cc
@@ -36,8 +36,6 @@ protected:
 
 void test06()
 {
-  bool test __attribute__((unused)) = true;
-
   try
     {
       // No-op in current code.
@@ -47,9 +45,8 @@ void test06()
     }
   catch(...)
     {
-      test = false;
+      VERIFY( false );
     }
-  VERIFY( test );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/6548_xin.cc b/libstdc++-v3/testsuite/27_io/objects/char/6548_xin.cc
index f73dd19..de8730c 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/6548_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/6548_xin.cc
@@ -23,7 +23,6 @@
 // libstdc++/6548
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   std::cout << "Enter 'test':";
   std::string s;
   std::getline(std::cin, s, '\n');
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/6648-1_xin.cc b/libstdc++-v3/testsuite/27_io/objects/char/6648-1_xin.cc
index 7d26c1d..a4d8a2e 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/6648-1_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/6648-1_xin.cc
@@ -23,7 +23,6 @@
 // Interactive tests: each one (run alone) must terminate upon a single '\n'.
 void test08()
 {
-  bool test __attribute__((unused)) = true;
   char buff[2048];
   std::cout << "Enter name: ";
   std::cin.getline(buff, 2048);
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/6648-2_xin.cc b/libstdc++-v3/testsuite/27_io/objects/char/6648-2_xin.cc
index 3083565..b74a300 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/6648-2_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/6648-2_xin.cc
@@ -21,7 +21,6 @@
 
 void test09()
 {
-  bool test __attribute__((unused)) = true;
   std::cout << "Enter favorite beach: ";
   std::cin.ignore(2048, '\n');
 }
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/7744_xin.cc b/libstdc++-v3/testsuite/27_io/objects/char/7744_xin.cc
index 5d3ec00..7618367 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/7744_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/7744_xin.cc
@@ -23,7 +23,6 @@
 // libstdc++/7744
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   std::ios::sync_with_stdio(false);
 
   std::cout << "Type in the characters 'abc' and press <ENTER>: ";
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/8.cc b/libstdc++-v3/testsuite/27_io/objects/char/8.cc
index 98e7179..d43f4cf 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/8.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/8.cc
@@ -24,8 +24,6 @@
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-  
   // 27.3 - Standard iostream objects p 2
   // The objects are not destroyed during program execution.
   void* p1 = &std::cout;
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/9.cc b/libstdc++-v3/testsuite/27_io/objects/char/9.cc
index 4ed6b8e..a36807a 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/9.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/9.cc
@@ -27,7 +27,6 @@ void test09()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_09";
 
   FILE* fout = fopen(name, "w");
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/9661-2_xin.cc b/libstdc++-v3/testsuite/27_io/objects/char/9661-2_xin.cc
index b5a87a5..68f8eaa 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/9661-2_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/9661-2_xin.cc
@@ -25,8 +25,6 @@ void test02()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
-
   int c1 = fgetc(stdin);
   int c2 = cin.rdbuf()->sputbackc(c1);
   VERIFY( c2 == c1 );
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/dr455.cc b/libstdc++-v3/testsuite/27_io/objects/char/dr455.cc
index 1e24b5a..6ae017b 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/dr455.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/dr455.cc
@@ -23,8 +23,6 @@
 // DR 455. cerr::tie() and wcerr::tie() are overspecified.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::cerr.tie() == &std::cout );
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/1.cc
index bb52985..1c59927 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/1.cc
@@ -77,8 +77,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   wchar_t array2[20];
   typedef std::wios::traits_type wtraits_type;
   wtraits_type::int_type wi = 15;
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
index b57965f..b6fae90 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
@@ -28,8 +28,7 @@
 void test10()
 {
   using namespace std;
-  
-  bool test __attribute__((unused)) = true;
+
   const char* name = "tmp_10";
 
   locale loc(locale("se_NO.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
index 015da04..560d9e7 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
@@ -28,8 +28,7 @@
 void test11()
 {
   using namespace std;
-  
-  bool test __attribute__((unused)) = true;
+
   const char* name = "tmp_11";
 
   locale loc(locale("se_NO.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
index 506a2f8..90481c9 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
@@ -33,8 +33,7 @@
 void test12()
 {
   using namespace std;
-  
-  bool test __attribute__((unused)) = true;
+
   const char* name = "tmp_12";
 
   locale loc(locale("se_NO.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
index 72534de..6955a77 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
@@ -32,8 +32,7 @@
 void test13()
 {
   using namespace std;
-  
-  bool test __attribute__((unused)) = true;
+
   const char* name = "tmp_13";
 
   locale loc(locale("se_NO.UTF-8"));
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc
index b685092..b02e886 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc
@@ -24,7 +24,6 @@
 // libstdc++/13582
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   ios_base::sync_with_stdio(false);
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/3045.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/3045.cc
index 62c8e63..c654a05 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/3045.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/3045.cc
@@ -37,7 +37,6 @@ gnu_filebuf buf(initial);
 // libstdc++/3045, in a vague way.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   int k1;
 
   // 1 normal
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/41037.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/41037.cc
index e86b681..4177062 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/41037.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/41037.cc
@@ -21,8 +21,6 @@
 // PR libstdc++/41037
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::wcerr.flags() & std::ios_base::dec );
   VERIFY( std::wcerr.flags() & std::ios_base::skipws );
   VERIFY( std::wcerr.flags() & std::ios_base::unitbuf );
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc
index 2a581d2..578bef1 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/5.cc
@@ -68,7 +68,6 @@ int use_standard_streams()
 
 void test05()
 {
-  bool test __attribute__((unused)) = true;
   int i = static_ob.i;
 
   VERIFY( std::wcin.iword(i) == i + 1 );
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6548_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6548_xin.cc
index 2f91f89..71aa93a 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6548_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6548_xin.cc
@@ -23,7 +23,6 @@
 // libstdc++/6548
 void test07()
 {
-  bool test __attribute__((unused)) = true;
   std::wcout << L"Enter 'test':";
   std::wstring s;
   std::getline(std::wcin, s, L'\n');
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-1_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-1_xin.cc
index b845834..30297cd 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-1_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-1_xin.cc
@@ -23,7 +23,6 @@
 // Interactive tests: each one (run alone) must terminate upon a single '\n'.
 void test08()
 {
-  bool test __attribute__((unused)) = true;
   wchar_t buff[2048];
   std::wcout << "Enter name: ";
   std::wcin.getline(buff, 2048);
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-2_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-2_xin.cc
index ba1a789..9937f69 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-2_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/6648-2_xin.cc
@@ -21,7 +21,6 @@
 
 void test09()
 {
-  bool test __attribute__((unused)) = true;
   std::wcout << L"Enter favorite beach: ";
   std::wcin.ignore(2048, '\n');
 }
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/7744_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/7744_xin.cc
index 2b3a94a..b166f27 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/7744_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/7744_xin.cc
@@ -23,7 +23,6 @@
 // libstdc++/7744
 void test11()
 {
-  bool test __attribute__((unused)) = true;
   std::ios::sync_with_stdio(false);
 
   std::wcout << "Type in the characters 'abc' and press <ENTER>: ";
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/8.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/8.cc
index cffa5ec..a389c34 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/8.cc
@@ -24,8 +24,6 @@
 
 void test02() 
 {
-  bool test __attribute__((unused)) = true;
-  
   // 27.3 - Standard iostream objects p 2
   // The objects are not destroyed during program execution.
   void* p1 = &std::wcout;
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
index 15cbf6f..a2c5b8f 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
@@ -27,7 +27,6 @@ void test01()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
   const char* name = "tmp_9520";
 
   FILE* file = fopen(name, "w");
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-2_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-2_xin.cc
index c0f8de9..61919b2 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-2_xin.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9661-2_xin.cc
@@ -26,8 +26,6 @@ void test02()
 {
   using namespace std;
 
-  bool test __attribute__((unused)) = true;
-
   wint_t c1 = fgetwc(stdin);
   wint_t c2 = wcin.rdbuf()->sputbackc(c1);
   VERIFY( c2 == c1 );
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9662.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9662.cc
index d988a14..c005a0d 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9662.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9662.cc
@@ -26,8 +26,6 @@
 // on stdout.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::wcout << L"Hello, ";
   VERIFY( std::fwide(stdout, 0) >= 0 );
   int ret = std::fputws(L"world!\n", stdout);
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/dr455.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/dr455.cc
index 6f9875e..13fd218 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/dr455.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/dr455.cc
@@ -23,8 +23,6 @@
 // DR 455. cerr::tie() and wcerr::tie() are overspecified.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::wcerr.tie() == &std::wcout );
 }
 
diff --git a/libstdc++-v3/testsuite/27_io/types/3.cc b/libstdc++-v3/testsuite/27_io/types/3.cc
index f0f658e..4c253be 100644
--- a/libstdc++-v3/testsuite/27_io/types/3.cc
+++ b/libstdc++-v3/testsuite/27_io/types/3.cc
@@ -23,8 +23,6 @@
 
 void check(std::streamsize n)
 {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( std::streamsize(std::streamoff(n)) == n );
 }