From 684211e11b3722ae171a76b075fe22528a275a7b Mon Sep 17 00:00:00 2001
From: Matthew Wahab <matthew.wahab@arm.com>
Date: Mon, 12 Sep 2016 09:03:50 +0000
Subject: [PATCH] [libstdc++-v3] Fix dg-require before dg-run directives in
 testsuite.

	* testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc:
	Move dg-do directive before dg-require.
	* testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc: Likewise.
	* testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc:
	Likewise.
	* testsuite/22_locale/codecvt/utf8.cc: Likewise.
	* testsuite/22_locale/locale/cons/unicode.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert5_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/deque/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/60499.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after2_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after3_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after4_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after5_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after6_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after7_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after8_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/erase_after9_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/insert_after1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/insert_after2_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/insert_after3_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/insert_after4_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after2_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after3_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after4_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after5_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after6_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/debug/splice_after7_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert5_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/list/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/60499.cc: Likewise.
	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/map/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/60499.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/multimap/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/60499.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/multiset/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/60499.cc: Likewise.
	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/set/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/60499.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/begin1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/begin2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/cbegin_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/cend_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/end1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/end2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/60499.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/cend_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/end1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/end2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/60499.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/cend_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/end1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/end2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc:
	Likewise.
	*  testsuite/23_containers/unordered_set/debug/60499.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/begin1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/begin2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/cbegin_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/cend_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/end1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/end2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/debug/52433.cc: Likewise.
	* testsuite/23_containers/vector/debug/60499.cc: Likewise.
	* testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc: Likewise.
	* testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/debug/self_move_assign_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise.
	* testsuite/25_algorithms/pop_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/push_heap/complexity.cc: Likewise.
	* testsuite/25_algorithms/sort_heap/complexity.cc: Likewise.
	* testsuite/29_atomics/atomic/60658.cc: Likewise.
	* testsuite/29_atomics/atomic/60695.cc: Likewise.
	* testsuite/29_atomics/atomic/62259.cc: Likewise.
	* testsuite/29_atomics/atomic/64658.cc: Likewise.
	* testsuite/29_atomics/atomic/cons/49445.cc: Likewise.
	* testsuite/29_atomics/atomic/operators/51811.cc: Likewise.
	* testsuite/29_atomics/atomic/operators/pointer_partial_void.cc: Likewise.

From-SVN: r240090
---
 libstdc++-v3/ChangeLog                        | 253 ++++++++++++++++++
 .../codecvt/codecvt_utf16/requirements/1.cc   |   2 +-
 .../codecvt/codecvt_utf8/requirements/1.cc    |   2 +-
 .../codecvt_utf8_utf16/requirements/1.cc      |   2 +-
 .../testsuite/22_locale/codecvt/utf8.cc       |   2 +-
 .../22_locale/locale/cons/unicode.cc          |   2 +-
 .../23_containers/deque/debug/assign1_neg.cc  |   2 +-
 .../23_containers/deque/debug/assign2_neg.cc  |   2 +-
 .../23_containers/deque/debug/assign3_neg.cc  |   2 +-
 .../deque/debug/construct1_neg.cc             |   2 +-
 .../deque/debug/construct2_neg.cc             |   2 +-
 .../deque/debug/construct3_neg.cc             |   2 +-
 .../23_containers/deque/debug/insert1_neg.cc  |   2 +-
 .../23_containers/deque/debug/insert2_neg.cc  |   2 +-
 .../23_containers/deque/debug/insert3_neg.cc  |   2 +-
 .../23_containers/deque/debug/insert5_neg.cc  |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../deque/debug/self_move_assign_neg.cc       |   2 +-
 .../deque/debug/shrink_to_fit.cc              |   2 +-
 .../23_containers/forward_list/debug/60499.cc |   2 +-
 .../forward_list/debug/construct1_neg.cc      |   2 +-
 .../forward_list/debug/construct2_neg.cc      |   2 +-
 .../forward_list/debug/construct3_neg.cc      |   2 +-
 .../forward_list/debug/erase_after1_neg.cc    |   2 +-
 .../forward_list/debug/erase_after2_neg.cc    |   2 +-
 .../forward_list/debug/erase_after3_neg.cc    |   2 +-
 .../forward_list/debug/erase_after4_neg.cc    |   2 +-
 .../forward_list/debug/erase_after5_neg.cc    |   2 +-
 .../forward_list/debug/erase_after6_neg.cc    |   2 +-
 .../forward_list/debug/erase_after7_neg.cc    |   2 +-
 .../forward_list/debug/erase_after8_neg.cc    |   2 +-
 .../forward_list/debug/erase_after9_neg.cc    |   2 +-
 .../forward_list/debug/insert_after1_neg.cc   |   2 +-
 .../forward_list/debug/insert_after2_neg.cc   |   2 +-
 .../forward_list/debug/insert_after3_neg.cc   |   2 +-
 .../forward_list/debug/insert_after4_neg.cc   |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../debug/self_move_assign_neg.cc             |   2 +-
 .../forward_list/debug/splice_after1_neg.cc   |   2 +-
 .../forward_list/debug/splice_after2_neg.cc   |   2 +-
 .../forward_list/debug/splice_after3_neg.cc   |   2 +-
 .../forward_list/debug/splice_after4_neg.cc   |   2 +-
 .../forward_list/debug/splice_after5_neg.cc   |   2 +-
 .../forward_list/debug/splice_after6_neg.cc   |   2 +-
 .../forward_list/debug/splice_after7_neg.cc   |   2 +-
 .../23_containers/list/debug/assign1_neg.cc   |   2 +-
 .../23_containers/list/debug/assign2_neg.cc   |   2 +-
 .../23_containers/list/debug/assign3_neg.cc   |   2 +-
 .../list/debug/construct1_neg.cc              |   2 +-
 .../list/debug/construct2_neg.cc              |   2 +-
 .../list/debug/construct3_neg.cc              |   2 +-
 .../23_containers/list/debug/insert1_neg.cc   |   2 +-
 .../23_containers/list/debug/insert2_neg.cc   |   2 +-
 .../23_containers/list/debug/insert3_neg.cc   |   2 +-
 .../23_containers/list/debug/insert5_neg.cc   |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../list/debug/self_move_assign_neg.cc        |   2 +-
 .../23_containers/map/debug/60499.cc          |   2 +-
 .../23_containers/map/debug/construct1_neg.cc |   2 +-
 .../23_containers/map/debug/construct2_neg.cc |   2 +-
 .../23_containers/map/debug/construct3_neg.cc |   2 +-
 .../23_containers/map/debug/insert1_neg.cc    |   2 +-
 .../23_containers/map/debug/insert2_neg.cc    |   2 +-
 .../23_containers/map/debug/insert3_neg.cc    |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../map/debug/self_move_assign_neg.cc         |   2 +-
 .../23_containers/multimap/debug/60499.cc     |   2 +-
 .../multimap/debug/construct1_neg.cc          |   2 +-
 .../multimap/debug/construct2_neg.cc          |   2 +-
 .../multimap/debug/construct3_neg.cc          |   2 +-
 .../multimap/debug/insert1_neg.cc             |   2 +-
 .../multimap/debug/insert2_neg.cc             |   2 +-
 .../multimap/debug/insert3_neg.cc             |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../multimap/debug/self_move_assign_neg.cc    |   2 +-
 .../23_containers/multiset/debug/60499.cc     |   2 +-
 .../multiset/debug/construct1_neg.cc          |   2 +-
 .../multiset/debug/construct2_neg.cc          |   2 +-
 .../multiset/debug/construct3_neg.cc          |   2 +-
 .../multiset/debug/insert1_neg.cc             |   2 +-
 .../multiset/debug/insert2_neg.cc             |   2 +-
 .../multiset/debug/insert3_neg.cc             |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../multiset/debug/self_move_assign_neg.cc    |   2 +-
 .../23_containers/set/debug/60499.cc          |   2 +-
 .../23_containers/set/debug/construct1_neg.cc |   2 +-
 .../23_containers/set/debug/construct2_neg.cc |   2 +-
 .../23_containers/set/debug/construct3_neg.cc |   2 +-
 .../23_containers/set/debug/insert1_neg.cc    |   2 +-
 .../23_containers/set/debug/insert2_neg.cc    |   2 +-
 .../23_containers/set/debug/insert3_neg.cc    |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../set/debug/self_move_assign_neg.cc         |   2 +-
 .../unordered_map/debug/60499.cc              |   2 +-
 .../unordered_map/debug/begin1_neg.cc         |   2 +-
 .../unordered_map/debug/begin2_neg.cc         |   2 +-
 .../unordered_map/debug/bucket_size_neg.cc    |   2 +-
 .../unordered_map/debug/cbegin_neg.cc         |   2 +-
 .../unordered_map/debug/cend_neg.cc           |   2 +-
 .../unordered_map/debug/construct1_neg.cc     |   2 +-
 .../unordered_map/debug/construct2_neg.cc     |   2 +-
 .../unordered_map/debug/construct3_neg.cc     |   2 +-
 .../unordered_map/debug/end1_neg.cc           |   2 +-
 .../unordered_map/debug/end2_neg.cc           |   2 +-
 .../unordered_map/debug/insert1_neg.cc        |   2 +-
 .../unordered_map/debug/insert2_neg.cc        |   2 +-
 .../unordered_map/debug/insert3_neg.cc        |   2 +-
 .../invalid_local_iterator_compare_neg.cc     |   2 +-
 .../debug/invalid_local_iterator_range_neg.cc |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../debug/max_load_factor_neg.cc              |   2 +-
 .../debug/self_move_assign_neg.cc             |   2 +-
 .../debug/use_erased_local_iterator_neg.cc    |   2 +-
 .../debug/use_invalid_iterator_neg.cc         |   2 +-
 .../debug/use_invalid_local_iterator_neg.cc   |   2 +-
 .../unordered_multimap/debug/60499.cc         |   2 +-
 .../unordered_multimap/debug/begin1_neg.cc    |   2 +-
 .../unordered_multimap/debug/begin2_neg.cc    |   2 +-
 .../debug/bucket_size_neg.cc                  |   2 +-
 .../unordered_multimap/debug/cbegin_neg.cc    |   2 +-
 .../unordered_multimap/debug/cend_neg.cc      |   2 +-
 .../debug/construct1_neg.cc                   |   2 +-
 .../debug/construct2_neg.cc                   |   2 +-
 .../debug/construct3_neg.cc                   |   2 +-
 .../unordered_multimap/debug/end1_neg.cc      |   2 +-
 .../unordered_multimap/debug/end2_neg.cc      |   2 +-
 .../unordered_multimap/debug/insert1_neg.cc   |   2 +-
 .../unordered_multimap/debug/insert2_neg.cc   |   2 +-
 .../unordered_multimap/debug/insert3_neg.cc   |   2 +-
 .../invalid_local_iterator_compare_neg.cc     |   2 +-
 .../debug/invalid_local_iterator_range_neg.cc |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../debug/max_load_factor_neg.cc              |   2 +-
 .../debug/self_move_assign_neg.cc             |   2 +-
 .../debug/use_erased_local_iterator_neg.cc    |   2 +-
 .../debug/use_invalid_iterator_neg.cc         |   2 +-
 .../debug/use_invalid_local_iterator_neg.cc   |   2 +-
 .../unordered_multiset/debug/60499.cc         |   2 +-
 .../unordered_multiset/debug/begin1_neg.cc    |   2 +-
 .../unordered_multiset/debug/begin2_neg.cc    |   2 +-
 .../debug/bucket_size_neg.cc                  |   2 +-
 .../unordered_multiset/debug/cbegin_neg.cc    |   3 +-
 .../unordered_multiset/debug/cend_neg.cc      |   2 +-
 .../debug/construct1_neg.cc                   |   2 +-
 .../debug/construct2_neg.cc                   |   2 +-
 .../debug/construct3_neg.cc                   |   2 +-
 .../unordered_multiset/debug/end1_neg.cc      |   2 +-
 .../unordered_multiset/debug/end2_neg.cc      |   2 +-
 .../unordered_multiset/debug/insert1_neg.cc   |   2 +-
 .../unordered_multiset/debug/insert2_neg.cc   |   2 +-
 .../unordered_multiset/debug/insert3_neg.cc   |   2 +-
 .../invalid_local_iterator_compare_neg.cc     |   2 +-
 .../debug/invalid_local_iterator_range_neg.cc |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../debug/max_load_factor_neg.cc              |   2 +-
 .../debug/self_move_assign_neg.cc             |   2 +-
 .../debug/use_erased_local_iterator_neg.cc    |   2 +-
 .../debug/use_invalid_iterator_neg.cc         |   2 +-
 .../debug/use_invalid_local_iterator_neg.cc   |   2 +-
 .../unordered_set/debug/60499.cc              |   2 +-
 .../unordered_set/debug/begin1_neg.cc         |   2 +-
 .../unordered_set/debug/begin2_neg.cc         |   2 +-
 .../unordered_set/debug/bucket_size_neg.cc    |   2 +-
 .../unordered_set/debug/cbegin_neg.cc         |   2 +-
 .../unordered_set/debug/cend_neg.cc           |   2 +-
 .../unordered_set/debug/construct1_neg.cc     |   2 +-
 .../unordered_set/debug/construct2_neg.cc     |   2 +-
 .../unordered_set/debug/construct3_neg.cc     |   2 +-
 .../unordered_set/debug/end1_neg.cc           |   2 +-
 .../unordered_set/debug/end2_neg.cc           |   2 +-
 .../unordered_set/debug/insert1_neg.cc        |   2 +-
 .../unordered_set/debug/insert2_neg.cc        |   2 +-
 .../unordered_set/debug/insert3_neg.cc        |   2 +-
 .../invalid_local_iterator_compare_neg.cc     |   2 +-
 .../debug/invalid_local_iterator_range_neg.cc |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../debug/max_load_factor_neg.cc              |   2 +-
 .../debug/self_move_assign_neg.cc             |   2 +-
 .../debug/use_erased_local_iterator_neg.cc    |   2 +-
 .../debug/use_invalid_iterator_neg.cc         |   2 +-
 .../debug/use_invalid_local_iterator_neg.cc   |   2 +-
 .../23_containers/vector/debug/52433.cc       |   2 +-
 .../23_containers/vector/debug/60499.cc       |   2 +-
 .../vector/debug/bool/shrink_to_fit.cc        |   2 +-
 .../debug/iterator_self_move_assign_neg.cc    |   2 +-
 .../vector/debug/self_move_assign_neg.cc      |   2 +-
 .../vector/debug/shrink_to_fit.cc             |   2 +-
 .../25_algorithms/pop_heap/complexity.cc      |   2 +-
 .../25_algorithms/push_heap/complexity.cc     |   2 +-
 .../25_algorithms/sort_heap/complexity.cc     |   2 +-
 .../testsuite/29_atomics/atomic/60658.cc      |   2 +-
 .../testsuite/29_atomics/atomic/60695.cc      |   2 +-
 .../testsuite/29_atomics/atomic/62259.cc      |   2 +-
 .../testsuite/29_atomics/atomic/64658.cc      |   2 +-
 .../testsuite/29_atomics/atomic/cons/49445.cc |   2 +-
 .../29_atomics/atomic/operators/51811.cc      |   2 +-
 .../atomic/operators/pointer_partial_void.cc  |   2 +-
 197 files changed, 450 insertions(+), 196 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a73c1d96263..7d71749005f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,256 @@
+2016-09-12  Matthew Wahab  <matthew.wahab@arm.com>
+
+	* testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc:
+	Move dg-do directive before dg-require.
+	* testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc: Likewise.
+	* testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc:
+	Likewise.
+	* testsuite/22_locale/codecvt/utf8.cc: Likewise.
+	* testsuite/22_locale/locale/cons/unicode.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert5_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/deque/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/60499.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after1_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after2_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after3_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after4_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after5_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after6_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after7_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after8_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/erase_after9_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/insert_after1_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/insert_after2_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/insert_after3_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/insert_after4_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after1_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after2_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after3_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after4_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after5_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after6_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/debug/splice_after7_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert5_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/list/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/60499.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/map/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/60499.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/multimap/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/60499.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/multiset/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/60499.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/set/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/60499.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/begin1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/begin2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/cbegin_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/cend_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/end1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/end2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/60499.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/cend_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/end1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/end2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/60499.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/cend_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/end1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/end2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc:
+	Likewise.
+	*  testsuite/23_containers/unordered_set/debug/60499.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/begin1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/begin2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/cbegin_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/cend_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/end1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/end2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc:
+	Likewise.
+	* testsuite/23_containers/vector/debug/52433.cc: Likewise.
+	* testsuite/23_containers/vector/debug/60499.cc: Likewise.
+	* testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc: Likewise.
+	* testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc:
+	Likewise.
+	* testsuite/23_containers/vector/debug/self_move_assign_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise.
+	* testsuite/25_algorithms/pop_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/push_heap/complexity.cc: Likewise.
+	* testsuite/25_algorithms/sort_heap/complexity.cc: Likewise.
+	* testsuite/29_atomics/atomic/60658.cc: Likewise.
+	* testsuite/29_atomics/atomic/60695.cc: Likewise.
+	* testsuite/29_atomics/atomic/62259.cc: Likewise.
+	* testsuite/29_atomics/atomic/64658.cc: Likewise.
+	* testsuite/29_atomics/atomic/cons/49445.cc: Likewise.
+	* testsuite/29_atomics/atomic/operators/51811.cc: Likewise.
+	* testsuite/29_atomics/atomic/operators/pointer_partial_void.cc: Likewise.
+
 2016-09-11  Jonathan Wakely  <jwakely@redhat.com>
 
 	* libsupc++/new_opant.cc: Include exception_defines.h.
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
index a0000956b24..78ddb5cb61f 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-cstdint "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
 
 #include <codecvt>
 #include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
index 12ac516637e..a9c50efa282 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-cstdint "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
 
 #include <codecvt>
 #include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
index 4ebb6a424e0..0d569786ce5 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-cstdint "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
 
 #include <codecvt>
 #include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
index a20feb5ce94..86fdf0d391a 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-cstdint "" }
 // { dg-do run { target c++11 } }
+// { dg-require-cstdint "" }
 
 #include <locale>
 #include <iterator>
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
index 76f730ab875..906ddf199a6 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -1,5 +1,5 @@
-// { dg-require-iconv "ISO-8859-1" }
 // { dg-do run { target c++11 } }
+// { dg-require-iconv "ISO-8859-1" }
 
 // Copyright (C) 2006-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
index c866464a566..dc3442dae7f 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
index 92fc1e7bcab..5deed88f2c2 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
index a52eb4194ce..761e8e99505 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
index 2443b0d6ce5..637882fabb7 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
index c73adb736b5..46b0ee1a18d 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
index 297d9b312ab..7b52b3d523e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
index 5636fd4581b..2b28689eef1 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
index 956f696797f..7e2696e4d2e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
index 9ad8493093b..1c038167b3d 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
index 7fdf443b52a..a74d292c2ea 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
index 28e2e64fec5..64bc35a9c3a 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
index b378cd2aec5..576c726de92 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
index 51e0cb182f1..71819bb217a 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <deque>
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
index ed5caceef98..d127fb0c964 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
index cd0864f003a..9a970943793 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <forward_list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
index a9d4bda766f..7a47cd23b58 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <forward_list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
index b62204402e7..63b489109d1 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <forward_list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
index 59e03be4a91..ae90415d5d8 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
index a5a274380bc..6234de0df4d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
index dc14635415e..813fbede964 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
index 156db150647..3ef323329c6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
index 68f7fe82d42..376ac3727c6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
index 5fd14962e4c..ec0186d8624 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
index ecf60ffdba1..b7f0323a70f 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
index 3cfa7dc5d59..81fe1428899 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
index ee7db912e90..11fbca0f1be 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
index ae2f39940cc..1e9f245bf38 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
index f1fce3b744d..d2ea77ddf85 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
index 35706b809ba..ca94bfec19c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
index 2898090c49a..78495313c04 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
@@ -15,9 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-do run { target c++11 xfail *-*-* } }
 // { dg-require-debug-mode "" }
 // { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" }
-// { dg-do run { target c++11 xfail *-*-* } }
 
 #include <forward_list>
 #include <iterator>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
index bc197a57c41..37f395728a6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <forward_list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
index e50d37f0e9e..505d654121e 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <forward_list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
index 5f74f9cf23e..0222e1446b3 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
index 1416d616c15..87a467149ee 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
index 96b8290d87a..0735789ccc6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
index cfcc1b26dfa..15888983ce4 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
index 5bcf38d27a2..14217b21c5d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
index bf49d4337bf..ca5a3567872 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
index 6e8b067c266..d7c670ce9d5 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
index cde326f780a..1eee86fc317 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
index 19fbbdecd80..41eb33ed6c5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
index cc9d9ee3755..e0a4fc15aa9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
index ee4c237a107..fa60f5fc8e9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
index 650cee48915..a56ebcb6d6d 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
index 1e5408c2072..bffb701b371 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
index 57ce024b312..54bd5cb8086 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
index 58628a47e3e..4428aae7ab2 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
index f62bd3c2acf..0d93f5ac851 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
index 21f2781534d..cec84d02655 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
@@ -15,9 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-do run { xfail *-*-* } }
 // { dg-require-debug-mode "" }
 // { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" }
-// { dg-do run { xfail *-*-* } }
 
 #include <list>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
index 8b0639bacdb..31f4f370c5c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
index 7ab40ba6d15..833e95711f5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <list>
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
index ad4fb4499a6..ef12b3406bc 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
index b584060f5eb..e2589e85f2f 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
index e55c6665a68..f948438ff8f 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
index 2f7d8eb34f7..6732d18007d 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
index f8ef1d2c5d1..351d9377de7 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
index 582ef2e844e..46e1e078858 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
index 39fda63971c..58549e61fdd 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
index cc3e0e6c164..fa30d1bd1a6 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
index 4eb690d71d0..82233453691 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
index bda4b5ca278..a226e392bd9 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
index 2f37742bdaa..d73daa96dcd 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
index 9643e7fc379..89b9432d7c0 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
index 747cae43375..998846025e1 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
index 2fdb8383c15..e0dc28dbfae 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
index ed0509c8e98..edecbad6fe2 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
index 3ccd5e2bcd7..1c860b439fe 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
index 8062a986eb9..6160a572410 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
index 4f3c5f30be5..301c8844359 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
index b543590aecd..9b0f95db60b 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
index dcc5c84de43..bf167e25a5f 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
index 2592f1e8e6c..87ed3ae95a0 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
index 025df918443..743024050a0 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
index df2f9c55da7..275703ee1f0 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
index 7731c4bc638..ee92d388776 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
index 7c3ff360675..3182dfccd41 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
index 92ea5df3bdb..3f3cacd8179 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
index 4c5ed569dd9..e6b6fbc64b1 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
index de7cfb6267f..01dae77720a 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
index b10afb94f89..0c6504d08ef 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
index dffab017364..366d9bd84ab 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
index e8b2b5cf4f4..3038ebbfddd 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
index 35819e53785..81eaaf55ff4 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
index 2186b628b0f..699e5562915 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
index 26ba95318b5..6df317da578 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
index 4ce33c74734..171cbc72752 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
index 5d644301863..b2f022c6d14 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
index e77cc008172..6b00c818a91 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
index 3529123744c..ca9e7d242bf 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
index 3d3a8822d94..26880d0d740 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
index efe3f41d134..a8d856ff5bd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
index 4da34e4ce4a..016ae3e93c4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
index ef59af60716..318f4e925cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
index 44a8ac9d4a6..280773029f9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
index a83ffbd790e..3bca414fb49 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
index d7be31fff70..db865ee0ba2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
index 0425c3c1e03..cc0e37fd33e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
index 630da5118aa..9f129ce3dfd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
index b1831fc7514..dde90d1eb0e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
index f162cf5ac21..e053ec81b3e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
index 282f4681982..974e55d417e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
index 8cf90df6164..1bbbaa38d37 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
index 053ae09ad04..3965d8379bd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
index 916245b2bcd..252fb655c61 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
index e28d180b1f7..7044bc66c33 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
index 5e50f8e6fc5..0e53680da3e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
index 13c8798e48e..73c433ec5fd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
index e092db9f26a..d532f5a6e68 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
index ebc33564f11..9dad84f4a65 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
index 5bba00e046a..d22651e51f6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
index 761ec975309..51fb6c6824e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
index 3d3a8822d94..26880d0d740 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
index efe3f41d134..a8d856ff5bd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
index 4da34e4ce4a..016ae3e93c4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
index ef59af60716..318f4e925cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
index f1f1f730285..348f89a073d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
index 52b31cc5cc0..1a11da2e93f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
index a6da25341fe..ff7708d4d46 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
index 0425c3c1e03..cc0e37fd33e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
index 630da5118aa..9f129ce3dfd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
index 7e3e66f0440..80619e135e3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
index d00b90d0337..f9dfa53ac69 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
index ed26dfe6f83..673a19190ac 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
index 39ae989961e..fccaa7790ea 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
index aa6afde837a..33c4e5d1a73 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
index eb56977395c..c4dff78fcbb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
index eeba90938a5..45715d49efb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
index 146ba9af7c0..e4294ccd44f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
index 87a15bbcfd3..38720349e59 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
index 65a8d0a15eb..bd5ff47b2e2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
index f4b52749b22..f9eae0e90bb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_map>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
index c0be76ed974..aa7f818379f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
index 61e1b2b1411..96a0df277a4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
index e619e92d9a0..bf2019dc489 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
index f59b8b8162d..ed2b990d065 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
index 30f7161111a..b7b38256c8b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
@@ -15,8 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
+
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
index f335e0a4a60..f566ec3e8ac 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
index 58c9e52b500..2ad5ff1c09a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
index f00c3e35fe6..a8b2b64cca4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
index df49bf7ac44..206876aa3bd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
index c31100123b0..69393d23897 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
index beeb3567f63..eea80eda3dd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
index 9f9437d0821..28daab54dc3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
index 5c95a90f8ab..5dec12dc7ab 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
index 970b1285aad..b10b59dc5f6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
index eb84e0f83c5..cb500a0413c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
index 37d7e86a0fb..cb678ddffef 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
index 0255fbf3681..dbcecc809ee 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
index 9db1f40a601..d7e31e63a38 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
index 053357efbbb..4750d080c0e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
index c5264e3a815..d5e0a8e6612 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
index b3ba7365541..66670469e2a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
index 44f236fb6cf..927ee3b2ae8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
index 82cda7ff430..305585859ba 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
index d30e9c2244e..ed0519fce21 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
index c308f9b1f96..c0741356b48 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
index faaeffc8874..25436014e34 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
index d71399a3206..161c29c4741 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
index b1f22a95c7d..f1fa407ba7a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
index 6df1e2fa4c1..6eb11cdfea1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
index 14582ff206e..01a4479fff8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
index 6c025789c00..4be9f40cebd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
index b4e0f471f3a..a57d4a96b6e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
index 20c8f5aa909..05a9fcb60be 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
index 07de84c56b0..6c9de873ddf 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
index 2b61e9f539c..68b1a89dae4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
index f51d2305235..402b5e6c6de 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
index efef04a09a3..15debce5525 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
index 8f66931e720..21ee9415499 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
index 70a3e26fa29..ee516d81162 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
index 22e3ffcc160..bf5a09bfe07 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
index 2f973a650d3..f48d7ee0113 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
index 3a70fe6aea3..5d45df2d680 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
index bf784d135a3..171dbbf3fb9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
index 212e9087d31..04e8c52b0ae 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <unordered_set>
 #include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
index 462ad0e1a8a..6f5390e7d6e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/52433
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
index ab8e7f65a2e..788ce2e20f0 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
 
 // PR libstdc++/60499
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
index 195dbce98ee..e8f791825ce 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <vector>
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
index bc293b2624c..c6f238976ed 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <vector>
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
index b843ed5077e..d82b6b73d27 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <vector>
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
index d41145e9203..0bd161ac587 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
-// { dg-require-debug-mode "" }
 // { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
 
 #include <vector>
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
index 39999468b1d..d7e658a86c0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
@@ -15,9 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-do run { target c++11 } }
 // { dg-require-normal-mode "" }
 // { dg-require-cmath "" }
-// { dg-do run { target c++11 } }
 
 #include <cmath>
 #include <random>
diff --git a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
index c7c049c81c9..089512b1472 100644
--- a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
@@ -15,9 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-do run { target c++11 } }
 // { dg-require-normal-mode "" }
 // { dg-require-cmath "" }
-// { dg-do run { target c++11 } }
 
 #include <cmath>
 #include <random>
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
index bb93780ffd0..cfcaae9606a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-cmath "" }
 // { dg-do run { target c++11 } }
+// { dg-require-cmath "" }
 
 #include <cmath>
 #include <random>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
index 1524a570242..2daa2dcf0ff 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
 // { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
index 06749a4d1ba..d4913282eac 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
@@ -1,6 +1,6 @@
+// { dg-do compile { target c++11 } }
 // { dg-require-atomic-builtins "" }
 // { dg-options "-Wno-pedantic" }
-// { dg-do compile { target c++11 } }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc b/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
index a98b332c177..37d84adaf43 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
@@ -15,9 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-do compile { target c++11 } }
 // { dg-require-atomic-builtins "" }
 // { dg-require-cstdint "" }
-// { dg-do compile { target c++11 } }
 
 #include <atomic>
 #include <cstdint>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc b/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
index 7895b15d644..4a8369da474 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
@@ -15,8 +15,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// { dg-require-atomic-builtins "" }
 // { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
 
 #include <atomic>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
index 556bd0b09f1..f4445dee22f 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
 // { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
index a1ec8ecf401..9aa7cb054f3 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
 // { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
index e73c1bb31cc..1535454fc26 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
 // { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
 //