lang/gcc-aux: significantly reduce c++ testsuite diff file size

The majority of the 234k c++ testsuite patch can be eliminated with
REINPLACE_CMD at the post-extract phase.  Now it's 1/100th the size
at 2.3k.  No revbump necessary; the testsuite isn't even a default
option.  The same treatment can be done to lang/gcc47-aux later.

3 files changed, 311 insertions, 4614 deletions

diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index c3215570512e..6f4e3a937075 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -180,6 +180,16 @@ post-extract:
 	@${ECHO} "Applying composite patch diff-${suffix}"
 	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
 .endfor
+	@(cd ${WRKSRC}/libstdc++-v3/testsuite && ${REINPLACE_CMD} \
+	  -e 's|\*-\*-freebsd\*|*-*-dragonfly *-*-freebsd*|' ${CXXTS4DF})
+	@(cd ${WRKSRC}/libstdc++-v3/testsuite/22_locale && ${REINPLACE_CMD} \
+	  -e 's|ISO-8859|ISO8859|g' \
+	  -e 's|ja_JP.eucjp|ja_JP.eucJP|g' \
+	  -e 's|en_HK|zh_HK|g' \
+	  -e 's|en_PH|en_NZ|g' \
+	  -e 's|se_NO|no_NO|g' \
+	  -e 's|es_MX|es_ES|g' \
+	  -e 's|ru_RU.UTF8|ru_RU.UTF-8|g' ${LOCALE22FIX})
 .if ${PORT_OPTIONS:MSTATIC} || ${PORT_OPTIONS:MBOOTSTRAP}
 	# Ensure GNAT tools are built statically
 	${REINPLACE_CMD} -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
diff --git a/lang/gcc-aux/Makefile.common b/lang/gcc-aux/Makefile.common
index 33d4925650b7..4f8d3b911798 100644
--- a/lang/gcc-aux/Makefile.common
+++ b/lang/gcc-aux/Makefile.common
@@ -9,7 +9,306 @@ LIB_DEPENDS+=		libmpc.so:${PORTSDIR}/math/mpc
 ONLY_FOR_ARCHS= 	i386 amd64
 
 GNU_CONFIGURE=		yes
-USE_BZIP2=		yes
-USES=			iconv gmake perl5
+USES=			iconv gmake perl5 tar:bzip2
 USE_PERL5=		build
 ALL_TARGET=		default
+
+CXXTS4DF= \
+	17_intro/headers/c++1998/stdc++.cc \
+	17_intro/headers/c++1998/stdc++_multiple_inclusion.cc \
+	17_intro/headers/c++200x/stdc++.cc \
+	17_intro/headers/c++200x/stdc++_multiple_inclusion.cc \
+	18_support/pthread_guard.cc \
+	20_util/shared_ptr/thread/default_weaktoshared.cc \
+	21_strings/basic_string/pthread18185.cc \
+	21_strings/basic_string/pthread4.cc \
+	22_locale/locale/cons/12658_thread-1.cc \
+	22_locale/locale/cons/12658_thread-2.cc \
+	23_containers/list/pthread1.cc \
+	23_containers/list/pthread5.cc \
+	23_containers/map/pthread6.cc \
+	23_containers/vector/debug/multithreaded_swap.cc \
+	26_numerics/headers/cmath/c_math_dynamic.cc \
+	27_io/basic_ofstream/pthread2.cc \
+	27_io/basic_ostringstream/pthread3.cc \
+	30_threads/async/42819.cc \
+	30_threads/async/49668.cc \
+	30_threads/async/any.cc \
+	30_threads/async/async.cc \
+	30_threads/async/launch.cc \
+	30_threads/async/sync.cc \
+	30_threads/call_once/39909.cc \
+	30_threads/call_once/49668.cc \
+	30_threads/call_once/call_once1.cc \
+	30_threads/condition_variable/cons/1.cc \
+	30_threads/condition_variable/members/1.cc \
+	30_threads/condition_variable/members/2.cc \
+	30_threads/condition_variable/native_handle/typesizes.cc \
+	30_threads/condition_variable_any/50862.cc \
+	30_threads/condition_variable_any/cons/1.cc \
+	30_threads/condition_variable_any/members/1.cc \
+	30_threads/condition_variable_any/members/2.cc \
+	30_threads/future/cons/move.cc \
+	30_threads/future/members/45133.cc \
+	30_threads/future/members/get.cc \
+	30_threads/future/members/get2.cc \
+	30_threads/future/members/share.cc \
+	30_threads/future/members/valid.cc \
+	30_threads/future/members/wait.cc \
+	30_threads/future/members/wait_for.cc \
+	30_threads/future/members/wait_until.cc \
+	30_threads/lock/1.cc \
+	30_threads/lock/2.cc \
+	30_threads/lock/3.cc \
+	30_threads/lock/4.cc \
+	30_threads/mutex/cons/1.cc \
+	30_threads/mutex/dest/destructor_locked.cc \
+	30_threads/mutex/lock/1.cc \
+	30_threads/mutex/native_handle/1.cc \
+	30_threads/mutex/native_handle/typesizes.cc \
+	30_threads/mutex/try_lock/1.cc \
+	30_threads/mutex/try_lock/2.cc \
+	30_threads/mutex/unlock/1.cc \
+	30_threads/packaged_task/49668.cc \
+	30_threads/packaged_task/cons/1.cc \
+	30_threads/packaged_task/cons/2.cc \
+	30_threads/packaged_task/cons/3.cc \
+	30_threads/packaged_task/cons/alloc.cc \
+	30_threads/packaged_task/cons/move.cc \
+	30_threads/packaged_task/cons/move_assign.cc \
+	30_threads/packaged_task/members/get_future.cc \
+	30_threads/packaged_task/members/get_future2.cc \
+	30_threads/packaged_task/members/invoke.cc \
+	30_threads/packaged_task/members/invoke2.cc \
+	30_threads/packaged_task/members/invoke3.cc \
+	30_threads/packaged_task/members/invoke4.cc \
+	30_threads/packaged_task/members/invoke5.cc \
+	30_threads/packaged_task/members/reset.cc \
+	30_threads/packaged_task/members/reset2.cc \
+	30_threads/packaged_task/members/swap.cc \
+	30_threads/packaged_task/members/valid.cc \
+	30_threads/promise/cons/1.cc \
+	30_threads/promise/cons/alloc.cc \
+	30_threads/promise/cons/move.cc \
+	30_threads/promise/cons/move_assign.cc \
+	30_threads/promise/members/get_future.cc \
+	30_threads/promise/members/get_future2.cc \
+	30_threads/promise/members/set_exception.cc \
+	30_threads/promise/members/set_exception2.cc \
+	30_threads/promise/members/set_value.cc \
+	30_threads/promise/members/set_value2.cc \
+	30_threads/promise/members/set_value3.cc \
+	30_threads/promise/members/swap.cc \
+	30_threads/recursive_mutex/cons/1.cc \
+	30_threads/recursive_mutex/dest/destructor_locked.cc \
+	30_threads/recursive_mutex/lock/1.cc \
+	30_threads/recursive_mutex/native_handle/1.cc \
+	30_threads/recursive_mutex/native_handle/typesizes.cc \
+	30_threads/recursive_mutex/try_lock/1.cc \
+	30_threads/recursive_mutex/try_lock/2.cc \
+	30_threads/recursive_mutex/unlock/1.cc \
+	30_threads/recursive_timed_mutex/cons/1.cc \
+	30_threads/recursive_timed_mutex/dest/destructor_locked.cc \
+	30_threads/recursive_timed_mutex/lock/1.cc \
+	30_threads/recursive_timed_mutex/lock/2.cc \
+	30_threads/recursive_timed_mutex/native_handle/1.cc \
+	30_threads/recursive_timed_mutex/native_handle/typesizes.cc \
+	30_threads/recursive_timed_mutex/try_lock/1.cc \
+	30_threads/recursive_timed_mutex/try_lock/2.cc \
+	30_threads/recursive_timed_mutex/try_lock_for/1.cc \
+	30_threads/recursive_timed_mutex/try_lock_for/2.cc \
+	30_threads/recursive_timed_mutex/try_lock_for/3.cc \
+	30_threads/recursive_timed_mutex/try_lock_until/1.cc \
+	30_threads/recursive_timed_mutex/try_lock_until/2.cc \
+	30_threads/recursive_timed_mutex/unlock/1.cc \
+	30_threads/shared_future/cons/move.cc \
+	30_threads/shared_future/members/45133.cc \
+	30_threads/shared_future/members/get.cc \
+	30_threads/shared_future/members/get2.cc \
+	30_threads/shared_future/members/valid.cc \
+	30_threads/shared_future/members/wait.cc \
+	30_threads/shared_future/members/wait_for.cc \
+	30_threads/shared_future/members/wait_until.cc \
+	30_threads/this_thread/1.cc \
+	30_threads/this_thread/2.cc \
+	30_threads/this_thread/3.cc \
+	30_threads/this_thread/4.cc \
+	30_threads/thread/cons/1.cc \
+	30_threads/thread/cons/2.cc \
+	30_threads/thread/cons/3.cc \
+	30_threads/thread/cons/4.cc \
+	30_threads/thread/cons/49668.cc \
+	30_threads/thread/cons/5.cc \
+	30_threads/thread/cons/6.cc \
+	30_threads/thread/cons/7.cc \
+	30_threads/thread/cons/8.cc \
+	30_threads/thread/cons/9.cc \
+	30_threads/thread/cons/moveable.cc \
+	30_threads/thread/members/1.cc \
+	30_threads/thread/members/2.cc \
+	30_threads/thread/members/3.cc \
+	30_threads/thread/members/4.cc \
+	30_threads/thread/members/5.cc \
+	30_threads/thread/members/hardware_concurrency.cc \
+	30_threads/thread/swap/1.cc \
+	30_threads/timed_mutex/cons/1.cc \
+	30_threads/timed_mutex/dest/destructor_locked.cc \
+	30_threads/timed_mutex/lock/1.cc \
+	30_threads/timed_mutex/native_handle/1.cc \
+	30_threads/timed_mutex/native_handle/typesizes.cc \
+	30_threads/timed_mutex/try_lock/1.cc \
+	30_threads/timed_mutex/try_lock/2.cc \
+	30_threads/timed_mutex/try_lock_for/1.cc \
+	30_threads/timed_mutex/try_lock_for/2.cc \
+	30_threads/timed_mutex/try_lock_for/3.cc \
+	30_threads/timed_mutex/try_lock_until/1.cc \
+	30_threads/timed_mutex/try_lock_until/2.cc \
+	30_threads/timed_mutex/unlock/1.cc \
+	30_threads/try_lock/1.cc \
+	30_threads/try_lock/2.cc \
+	30_threads/try_lock/3.cc \
+	30_threads/try_lock/4.cc \
+	30_threads/unique_lock/cons/1.cc \
+	30_threads/unique_lock/cons/2.cc \
+	30_threads/unique_lock/cons/3.cc \
+	30_threads/unique_lock/cons/4.cc \
+	30_threads/unique_lock/cons/5.cc \
+	30_threads/unique_lock/cons/6.cc \
+	30_threads/unique_lock/locking/1.cc \
+	30_threads/unique_lock/locking/2.cc \
+	30_threads/unique_lock/locking/3.cc \
+	30_threads/unique_lock/locking/4.cc \
+	30_threads/unique_lock/modifiers/1.cc \
+	30_threads/unique_lock/modifiers/2.cc \
+	ext/rope/pthread7-rope.cc \
+	tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc \
+	tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc
+
+LOCALE22FIX= \
+	codecvt/always_noconv/char/wrapped_locale.cc \
+	codecvt/always_noconv/wchar_t/2.cc \
+	codecvt/always_noconv/wchar_t/3.cc \
+	codecvt/always_noconv/wchar_t/wrapped_locale.cc \
+	codecvt/encoding/char/wrapped_locale.cc \
+	codecvt/encoding/wchar_t/2.cc \
+	codecvt/encoding/wchar_t/3.cc \
+	codecvt/encoding/wchar_t/wrapped_locale.cc \
+	codecvt/in/char/wrapped_locale.cc \
+	codecvt/in/wchar_t/2.cc \
+	codecvt/in/wchar_t/3.cc \
+	codecvt/in/wchar_t/wrapped_locale.cc \
+	codecvt/length/char/wrapped_locale.cc \
+	codecvt/length/wchar_t/2.cc \
+	codecvt/length/wchar_t/3.cc \
+	codecvt/length/wchar_t/wrapped_locale.cc \
+	codecvt/max_length/char/wrapped_locale.cc \
+	codecvt/max_length/wchar_t/2.cc \
+	codecvt/max_length/wchar_t/3.cc \
+	codecvt/max_length/wchar_t/wrapped_locale.cc \
+	codecvt/out/char/wrapped_locale.cc \
+	codecvt/out/wchar_t/2.cc \
+	codecvt/out/wchar_t/3.cc \
+	codecvt/out/wchar_t/7.cc \
+	codecvt/out/wchar_t/wrapped_locale.cc \
+	codecvt/unshift/char/wrapped_locale.cc \
+	codecvt/unshift/wchar_t/2.cc \
+	codecvt/unshift/wchar_t/3.cc \
+	codecvt/unshift/wchar_t/wrapped_locale.cc \
+	collate/compare/char/wrapped_locale.cc \
+	collate/compare/wchar_t/wrapped_locale.cc \
+	collate/hash/char/wrapped_locale.cc \
+	collate/hash/wchar_t/wrapped_locale.cc \
+	collate/transform/char/wrapped_locale.cc \
+	collate/transform/wchar_t/wrapped_locale.cc \
+	ctype/cons/char/wrapped_locale.cc \
+	ctype/is/char/wrapped_locale.cc \
+	ctype/is/wchar_t/wrapped_locale.cc \
+	ctype/narrow/char/wrapped_locale.cc \
+	ctype/narrow/wchar_t/3.cc \
+	ctype/narrow/wchar_t/wrapped_locale.cc \
+	ctype/scan/char/wrapped_locale.cc \
+	ctype/scan/wchar_t/wrapped_locale.cc \
+	ctype/to/char/wrapped_locale.cc \
+	ctype/to/wchar_t/wrapped_locale.cc \
+	ctype/widen/char/wrapped_locale.cc \
+	ctype/widen/wchar_t/2.cc \
+	ctype/widen/wchar_t/3.cc \
+	ctype/widen/wchar_t/wrapped_locale.cc \
+	facet/2.cc \
+	locale/cons/40184.cc \
+	locale/cons/5.cc \
+	locale/cons/unicode.cc \
+	locale/global_locale_objects/2.cc \
+	messages/members/char/wrapped_locale.cc \
+	money_get/get/char/16.cc \
+	money_get/get/char/18.cc \
+	money_get/get/char/2.cc \
+	money_get/get/char/4.cc \
+	money_get/get/char/wrapped_env.cc \
+	money_get/get/char/wrapped_locale.cc \
+	money_get/get/wchar_t/16.cc \
+	money_get/get/wchar_t/18.cc \
+	money_get/get/wchar_t/2.cc \
+	money_get/get/wchar_t/4.cc \
+	money_get/get/wchar_t/wrapped_env.cc \
+	money_get/get/wchar_t/wrapped_locale.cc \
+	money_put/put/char/2.cc \
+	money_put/put/char/wrapped_env.cc \
+	money_put/put/char/wrapped_locale.cc \
+	money_put/put/wchar_t/2.cc \
+	money_put/put/wchar_t/wrapped_env.cc \
+	money_put/put/wchar_t/wrapped_locale.cc \
+	moneypunct/members/char/wrapped_locale.cc \
+	moneypunct/members/wchar_t/wrapped_locale.cc \
+	num_get/get/char/3.cc \
+	num_get/get/char/wrapped_env.cc \
+	num_get/get/char/wrapped_locale.cc \
+	num_get/get/wchar_t/3.cc \
+	num_get/get/wchar_t/wrapped_env.cc \
+	num_get/get/wchar_t/wrapped_locale.cc \
+	num_put/put/char/3.cc \
+	num_put/put/char/wrapped_env.cc \
+	num_put/put/char/wrapped_locale.cc \
+	num_put/put/wchar_t/3.cc \
+	num_put/put/wchar_t/wrapped_env.cc \
+	num_put/put/wchar_t/wrapped_locale.cc \
+	numpunct/members/char/wrapped_locale.cc \
+	numpunct/members/wchar_t/wrapped_locale.cc \
+	time_get/date_order/char/wrapped_locale.cc \
+	time_get/date_order/wchar_t/wrapped_locale.cc \
+	time_get/get_date/char/2.cc \
+	time_get/get_date/char/wrapped_env.cc \
+	time_get/get_date/char/wrapped_locale.cc \
+	time_get/get_date/wchar_t/2.cc \
+	time_get/get_date/wchar_t/wrapped_env.cc \
+	time_get/get_date/wchar_t/wrapped_locale.cc \
+	time_get/get_monthname/char/2.cc \
+	time_get/get_monthname/char/wrapped_env.cc \
+	time_get/get_monthname/char/wrapped_locale.cc \
+	time_get/get_monthname/wchar_t/2.cc \
+	time_get/get_monthname/wchar_t/wrapped_env.cc \
+	time_get/get_monthname/wchar_t/wrapped_locale.cc \
+	time_get/get_time/char/2.cc \
+	time_get/get_time/char/wrapped_env.cc \
+	time_get/get_time/char/wrapped_locale.cc \
+	time_get/get_time/wchar_t/2.cc \
+	time_get/get_time/wchar_t/wrapped_env.cc \
+	time_get/get_time/wchar_t/wrapped_locale.cc \
+	time_get/get_weekday/char/2.cc \
+	time_get/get_weekday/char/38081-1.cc \
+	time_get/get_weekday/char/38081-2.cc \
+	time_get/get_weekday/char/wrapped_env.cc \
+	time_get/get_weekday/char/wrapped_locale.cc \
+	time_get/get_weekday/wchar_t/2.cc \
+	time_get/get_weekday/wchar_t/wrapped_env.cc \
+	time_get/get_weekday/wchar_t/wrapped_locale.cc \
+	time_get/get_year/char/wrapped_locale.cc \
+	time_get/get_year/wchar_t/wrapped_locale.cc \
+	time_put/put/char/3.cc \
+	time_put/put/char/7.cc \
+	time_put/put/char/wrapped_env.cc \
+	time_put/put/char/wrapped_locale.cc \
+	time_put/put/wchar_t/3.cc \
+	time_put/put/wchar_t/7.cc \
+	time_put/put/wchar_t/wrapped_env.cc \
+	time_put/put/wchar_t/wrapped_locale.cc
diff --git a/lang/gcc-aux/files/diff-cxx-testsuite b/lang/gcc-aux/files/diff-cxx-testsuite
index acb824c886aa..433450dca03c 100644
--- a/lang/gcc-aux/files/diff-cxx-testsuite
+++ b/lang/gcc-aux/files/diff-cxx-testsuite
@@ -24,1799 +24,6 @@
    ffloat (vdouble); /* { dg-warning "conversion" } */
    vfloat = vdouble; /* { dg-warning "conversion" } */
    ffloat (vlongdouble); /* { dg-warning "conversion" } */
---- gcc/testsuite/g++.dg/cdce3.C.orig
-+++ gcc/testsuite/g++.dg/cdce3.C
-@@ -1,4 +1,4 @@
--/* { dg-do run } */
-+/* { dg-do run { target { ! "*-*-freebsd* *-*-dragonfly* *-*-netbsd*" } } } */
- /* { dg-require-effective-target c99_runtime } */
- /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details -lm" } */
- /* { dg-additional-options "-DLARGE_LONG_DOUBLE" { target large_long_double } } */
---- gcc/testsuite/gcc.dg/builtins-config.h.orig
-+++ gcc/testsuite/gcc.dg/builtins-config.h
-@@ -16,8 +16,14 @@
- /* Interix6 doesn't have the entire C99 runtime.  */
- #elif defined(__AVR__)
- /* AVR doesn't have the entire C99 runtime.  */
--#elif defined(__FreeBSD__) && (__FreeBSD__ < 9)
--/* FreeBSD up to version 8 lacks support for cexp and friends.  */
-+#elif defined(__FreeBSD__) && (__FreeBSD__ < 10)
-+/* FreeBSD up to version 9 lacks support for cexp and friends.  */
-+#elif defined(__DragonFly__)
-+/* As of DragonFly 2.13, Full C99 support is not available.
-+   It has the same libm functionality as FreeBSD, which is missing
-+   several long-double functions. */
-+#elif defined(__NetBSD__)
-+/* As of NetBSD 5.99, libm is nowhere close to supporting C99 */
- #elif defined(__vxworks)
- /* VxWorks doesn't have a full C99 time.  (cabs is missing, for example.)  */
- #elif defined(_WIN32) && !defined(__CYGWIN__)
---- libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-do compile }
- // 1999-05-12 bkoz
- 
---- libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_multiple_inclusion.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_multiple_inclusion.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-do compile }
- // 1999-05-12 bkoz
- 
---- libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-options "-std=gnu++0x" }
- // { dg-do compile }
- 
---- libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++_multiple_inclusion.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++_multiple_inclusion.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-options "-std=gnu++0x" }
- // { dg-do compile }
- 
---- libstdc++-v3/testsuite/18_support/pthread_guard.cc.orig
-+++ libstdc++-v3/testsuite/18_support/pthread_guard.cc
-@@ -16,8 +16,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-darwin* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-darwin* } }
- 
- #include <cstdlib>
- #include <pthread.h>
---- libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
-@@ -17,8 +17,8 @@
- 
- // 20.6.6.2 Template class shared_ptr [util.smartptr.shared]
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread -std=gnu++0x" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread -std=gnu++0x" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads -std=gnu++0x" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- 
---- libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
-@@ -17,8 +17,8 @@
- 
- // 20.6.6.2 Template class shared_ptr [util.smartptr.shared]
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- 
---- libstdc++-v3/testsuite/21_strings/basic_string/pthread18185.cc.orig
-+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread18185.cc
-@@ -16,8 +16,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <ext/new_allocator.h>
---- libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc.orig
-+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc
-@@ -19,8 +19,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <string>
---- libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
---- libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
---- libstdc++-v3/testsuite/23_containers/list/pthread1.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/pthread1.cc
-@@ -17,8 +17,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- // This multi-threading C++/STL/POSIX code adheres to rules outlined here:
---- libstdc++-v3/testsuite/23_containers/list/pthread5.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/pthread5.cc
-@@ -19,8 +19,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <vector>
---- libstdc++-v3/testsuite/23_containers/map/pthread6.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/pthread6.cc
-@@ -18,8 +18,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <string>
---- libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/26_numerics/headers/cmath/c_math_dynamic.cc.orig
-+++ libstdc++-v3/testsuite/26_numerics/headers/cmath/c_math_dynamic.cc
-@@ -19,7 +19,7 @@
- 
- 
- // { dg-do link }
--// { dg-options "-D_XOPEN_SOURCE" { target *-*-freebsd* } }
-+// { dg-options "-D_XOPEN_SOURCE" { target *-*-freebsd* *-*-dragonfly* } }
- 
- #include <cmath>
- 
---- libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc
-@@ -18,8 +18,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <fstream>
---- libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc
-@@ -18,8 +18,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <sstream>
---- libstdc++-v3/testsuite/30_threads/async/42819.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/42819.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/any.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/any.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/async.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/async.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/sync.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/sync.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/39909.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/39909.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/45133.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/45133.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/get.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/get.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/get2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/get2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/swap.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options "-std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options "-std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options "-std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options "-std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/6.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/6.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/7.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/7.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/8.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/8.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/9.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/9.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/swap/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/swap/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc.orig
-+++ libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc
-@@ -17,8 +17,8 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <ext/rope>
---- libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc
-@@ -17,8 +17,8 @@
- 
- // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared]
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <tr1/memory>
---- libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc
-@@ -17,8 +17,8 @@
- 
- // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared]
- 
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux*r *-*-gnu* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- 
- #include <tr1/memory>
---- libstdc++-v3/testsuite/30_threads/async/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/launch.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/launch.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/share.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/share.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-gnu* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
 --- libstdc++-v3/testsuite/lib/libstdc++.exp.orig
 +++ libstdc++-v3/testsuite/lib/libstdc++.exp
 @@ -877,17 +877,18 @@
@@ -1841,2822 +48,3 @@
        puts $f "    return 1;"
        puts $f "  }"	
        puts $f "}"
---- libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
- 
---- libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/vector>
---- libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/vector>
---- libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3.  If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
- 
- #include <debug/vector>
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -27,14 +27,14 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test in ISO-8859-1 locale
-+// Baseline test in ISO8859-1 locale
- void test02()
- {
-   using namespace std;
-   bool test __attribute__((unused)) = true;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -27,14 +27,14 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test in ISO-8859-15 locale
-+// Baseline test in ISO8859-15 locale
- void test03()
- {
-   using namespace std;
-   bool test __attribute__((unused)) = true;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -27,19 +27,19 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Test do_encoding with ISO-8859-1 locale.
-+// Test do_encoding with ISO8859-1 locale.
- void test02()
- {
-   using namespace std;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
-   bool test __attribute__((unused)) = true;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
-   int i = cvt->encoding();
--  VERIFY( i == 1 ); // ISO-8859-1 is a single-byte encoding
-+  VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding
- }
- 
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -27,19 +27,19 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Test do_encoding with ISO-8859-15 locale.
-+// Test do_encoding with ISO8859-15 locale.
- void test03()
- {
-   using namespace std;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
-   bool test __attribute__((unused)) = true;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
-   int i = cvt->encoding();
--  VERIFY( i == 1 ); // ISO-8859-15 is a single-byte encoding
-+  VERIFY( i == 1 ); // ISO8859-15 is a single-byte encoding
- }
- 
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -41,7 +41,7 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test for ISO-8859-1. Converts entire charset.
-+// Baseline test for ISO8859-1. Converts entire charset.
- void test02()
- {
-   using namespace std;
-@@ -90,7 +90,7 @@
-   wmemset(i_ref, 0xdeadbeef, size + 1);
-   int_type*		ito_next;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -41,7 +41,7 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test for ISO-8859-15. Converts entire charset.
-+// Baseline test for ISO8859-15. Converts entire charset.
- void test03()
- {
-   using namespace std;
-@@ -104,7 +104,7 @@
-   wmemset(i_ref, 0xdeadbeef, size + 1);
-   int_type*		ito_next;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -63,7 +63,7 @@
-     "\xff";
-   int 			size = strlen(e_lit);
- 
--  locale  loc = locale("en_US.ISO-8859-1");
-+  locale  loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -63,7 +63,7 @@
-     "\xff";
-   int 			size = strlen(e_lit);
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -32,12 +32,12 @@
-   bool test __attribute__((unused)) = true;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
- 
--  locale  loc = locale("en_US.ISO-8859-1");
-+  locale  loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
-   int k = cvt->max_length();
--  VERIFY( k == 1 ); // ISO-8859-1 is a single-byte encoding
-+  VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding
- }
- 
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -32,12 +32,12 @@
-   bool test __attribute__((unused)) = true;
-   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
-   int k = cvt->max_length();
--  VERIFY( k == 1 ); // ISO-8859-15 is a single-byte encoding
-+  VERIFY( k == 1 ); // ISO8859-15 is a single-byte encoding
- }
- 
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -88,7 +88,7 @@
-   memset(e_ref, 0xf0, size + 1);
-   ext_type*		eto_next;
- 
--  locale  loc = locale("en_US.ISO-8859-1");
-+  locale  loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -102,7 +102,7 @@
-   memset(e_ref, 0xf0, size + 1);
-   ext_type*		eto_next;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -60,7 +60,7 @@
-   memset(e_ref, 0xf0, size + 1);
-   ext_type*		eto_next;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -73,7 +73,7 @@
-   memset(e_ref, 0xf0, size + 1);
-   ext_type*		eto_next;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
- 
- // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -87,7 +87,7 @@
-   memset(e_ref, 0xf0, size + 1);
-   ext_type*		eto_next;
- 
--  locale loc = locale("en_US.ISO-8859-15");
-+  locale loc = locale("en_US.ISO8859-15");
-   locale::global(loc);
-   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
- 
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
- 
- // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -31,7 +31,7 @@
-   using namespace std;
-   bool test __attribute__((unused)) = true;
- 
--  locale loc = locale("en_US.ISO-8859-1");
-+  locale loc = locale("en_US.ISO8859-1");
-   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
- 
-   char c = 0xff;
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
-+// { dg-require-namedlocale "de_DE.ISO8859-15@euro" }
- 
- // 2003-05-03  Petur Runolfsson <peturr02@ru.is>
- 
-@@ -36,7 +36,7 @@
-     putc(static_cast<unsigned char>(i), file);
-   fclose(file);
- 
--  locale loc (locale("de_DE.ISO-8859-15@euro"));
-+  locale loc (locale("de_DE.ISO8859-15@euro"));
-   wchar_t buf[1];
-   wfilebuf fb;
-   fb.pubimbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
-+// { dg-require-namedlocale "de_DE.ISO8859-15@euro" }
- 
- // 2003-04-30  Petur Runolfsson <peturr02@ru.is>
- 
-@@ -35,7 +35,7 @@
-     putc(static_cast<unsigned char>(i), file);
-   fclose(file);
- 
--  locale loc (locale("de_DE.ISO-8859-15@euro"));
-+  locale loc (locale("de_DE.ISO8859-15@euro"));
-   locale::global(loc); // Set locale for stdin
- 
-   VERIFY( freopen(name, "r", stdin) );
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "de_DE" }
-@@ -40,6 +40,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -44,6 +44,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc
-@@ -1,7 +1,7 @@
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -40,6 +40,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -44,6 +44,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -35,6 +35,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -39,6 +39,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -43,6 +43,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -38,6 +38,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,6 +37,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,6 +37,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // Copyright (C) 2009-2014 Free Software Foundation, Inc.
- //
-@@ -29,7 +29,7 @@
-   using namespace std;
-   bool test __attribute__((unused)) = true;
- 
--  locale locf(locale("C"), "ja_JP.eucjp", locale::monetary);
-+  locale locf(locale("C"), "ja_JP.eucJP", locale::monetary);
- 
-   const moneypunct<wchar_t, false>& mpf = 
-     use_facet<moneypunct<wchar_t, false> >(locf);
-@@ -40,7 +40,7 @@
- 
-   VERIFY( mpf.curr_symbol() == mpf_copy.curr_symbol() );
- 
--  locale loct(locale("C"), "ja_JP.eucjp", locale::monetary);
-+  locale loct(locale("C"), "ja_JP.eucJP", locale::monetary);
- 
-   const moneypunct<wchar_t, true>& mpt = 
-     use_facet<moneypunct<wchar_t, true> >(loct);
---- libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "en_US" }
-@@ -45,6 +45,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -69,6 +69,6 @@
-   two.push_back(&test06);
-   two.push_back(&test07);
-   two.push_back(&test08);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -69,6 +69,6 @@
-   two.push_back(&test06);
-   two.push_back(&test07);
-   two.push_back(&test08);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -59,6 +59,6 @@
-   two.push_back(&test04);
-   two.push_back(&test05);
-   two.push_back(&test06);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -59,6 +59,6 @@
-   two.push_back(&test04);
-   two.push_back(&test05);
-   two.push_back(&test06);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -38,6 +38,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -38,6 +38,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -59,6 +59,6 @@
-   two.push_back(&test04);
-   two.push_back(&test05);
-   two.push_back(&test06);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -59,6 +59,6 @@
-   two.push_back(&test04);
-   two.push_back(&test05);
-   two.push_back(&test06);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "es_ES" }
-@@ -55,6 +55,6 @@
-   two.push_back(&test03);
-   two.push_back(&test04);
-   two.push_back(&test05);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -54,6 +54,6 @@
-   two.push_back(&test03);
-   two.push_back(&test04);
-   two.push_back(&test05);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "is_IS" }
-@@ -40,6 +40,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "is_IS" }
-@@ -40,6 +40,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test02);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -32,6 +32,6 @@
-   using namespace __gnu_test;
-   func_callback two;
-   two.push_back(&test01);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -44,6 +44,6 @@
-   two.push_back(&test01);
-   two.push_back(&test02);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,6 +37,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,6 +37,6 @@
-   func_callback two;
-   two.push_back(&test01);
-   two.push_back(&test03);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc
-@@ -80,6 +80,6 @@
-   two.push_back(&test08);
-   two.push_back(&test09);
-   two.push_back(&test10);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -81,6 +81,6 @@
-   two.push_back(&test08);
-   two.push_back(&test09);
-   two.push_back(&test10);
--  run_tests_wrapped_locale("ja_JP.eucjp", two);
-+  run_tests_wrapped_locale("ja_JP.eucJP", two);
-   return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2004-03-02  Paolo Carlini  <pcarlini@suse.de>
- 
-@@ -37,7 +37,7 @@
-   // basic construction
-   locale loc_c = locale::classic();
-   locale loc_de = locale("de_DE@euro");
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_de );
-   VERIFY( loc_c != loc_hk );
- 
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
- 
-@@ -36,7 +36,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
-   
-   iterator_type end, end01, end02;
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // total EPA budget FY 2002
-@@ -80,7 +80,7 @@
-   VERIFY( result11 == digits4 );
-   VERIFY( err11 == ios_base::eofbit );
- 
--  // for the "en_HK" locale the parsing of the very same input streams must
-+  // for the "zh_HK" locale the parsing of the very same input streams must
-   // be successful without showbase too, since the symbol field appears in
-   // the first positions in the format and the symbol, when present, must be
-   // consumed.
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // input less than frac_digits
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2004-03-02  Paolo Carlini  <pcarlini@suse.de>
- 
-@@ -37,7 +37,7 @@
-   // basic construction
-   locale loc_c = locale::classic();
-   locale loc_de = locale("de_DE@euro");
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_de );
-   VERIFY( loc_c != loc_hk );
- 
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
- 
-@@ -36,7 +36,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
-   
-   iterator_type end, end01, end02;
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // total EPA budget FY 2002
-@@ -80,7 +80,7 @@
-   VERIFY( result11 == digits4 );
-   VERIFY( err11 == ios_base::eofbit );
- 
--  // for the "en_HK" locale the parsing of the very same input streams must
-+  // for the "zh_HK" locale the parsing of the very same input streams must
-   // be successful without showbase too, since the symbol field appears in
-   // the first positions in the format and the symbol, when present, must be
-   // consumed.
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // input less than frac_digits
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -35,7 +35,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_c != loc_hk );
- 
-   // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -75,7 +75,7 @@
-   VERIFY( time10.tm_year == time_bday.tm_year );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str("Sunday, April 04, 1971"); 
-   iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -75,7 +75,7 @@
-   VERIFY( time10.tm_year == time_bday.tm_year );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str(L"Sunday, April 04, 1971"); 
-   iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -63,7 +63,7 @@
-   VERIFY( time10.tm_mon == time_bday.tm_mon );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   const time_get<char>& tim_get2 = use_facet<time_get<char> >(iss.getloc()); 
-   iss.str("April"); 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -63,7 +63,7 @@
-   VERIFY( time10.tm_mon == time_bday.tm_mon );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   const time_get<wchar_t>& tim_get2 = use_facet<time_get<wchar_t> >(iss.getloc()); 
-   iss.str(L"April"); 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction and sanity check
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   const string empty;
-@@ -47,7 +47,7 @@
-   const ios_base::iostate good = ios_base::goodbit;
-   ios_base::iostate errorstate = good;
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str("12:00:00 PST"); 
-   // Hong Kong in California! Well, they have Paris in Vegas... this
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -34,7 +34,7 @@
- 
-   // basic construction and sanity check
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   const wstring empty;
-@@ -47,7 +47,7 @@
-   const ios_base::iostate good = ios_base::goodbit;
-   ios_base::iostate errorstate = good;
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str(L"12:00:00 PST"); 
-   // Hong Kong in California! Well, they have Paris in Vegas... this
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -64,7 +64,7 @@
-   VERIFY( time10.tm_wday == time_bday.tm_wday );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str("Sunday"); 
-   iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
- 
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
- 
-   // basic construction and sanity checks.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   locale loc_de = locale("de_DE");
-   VERIFY( loc_hk != loc_c );
-   VERIFY( loc_hk != loc_de );
-@@ -64,7 +64,7 @@
-   VERIFY( time10.tm_wday == time_bday.tm_wday );
-   VERIFY( errorstate == ios_base::eofbit );
- 
--  // inspection of named locales, en_HK
-+  // inspection of named locales, zh_HK
-   iss.imbue(loc_hk);
-   iss.str(L"Sunday"); 
-   iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- 
- // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "ja_JP.eucjp" }
- 
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,7 +37,7 @@
- 
-   // basic construction and sanity check.
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -40,7 +40,7 @@
- 
-   // basic construction and sanity check
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
- 
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
- 
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -37,7 +37,7 @@
- 
-   // basic construction and sanity check
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- 
- // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
- 
-@@ -40,7 +40,7 @@
- 
-   // basic construction and sanity check
-   locale loc_c = locale::classic();
--  locale loc_hk = locale("en_HK");
-+  locale loc_hk = locale("zh_HK");
-   VERIFY( loc_hk != loc_c );
- 
-   // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
- 
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
- // { dg-require-namedlocale "ja_JP.eucjp" }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -31,7 +31,7 @@
-   using namespace std;
-   bool test __attribute__((unused)) = true;
- 
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
-   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
- 
-   const wchar_t* wstrlit = L"\x80";
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -31,7 +31,7 @@
-   using namespace std;
-   bool test __attribute__((unused)) = true;
- 
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
-   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
- 
-   const char* strlit = "\xc2\x80";
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-08  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -91,7 +91,7 @@
-   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
- 
-   const int loops = 2 * BUFSIZ / wlen;
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   FILE* file = fopen(name, "w");
-   for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-08  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -35,7 +35,7 @@
-   bool test __attribute__((unused)) = true;
-   const char name[] = "tmp_seekoff-2.tst";
- 
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   const size_t size = 10;
-   wchar_t buf[size];
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-10-07  Petur Runolfsson  <peturr02@ru.is>
- //
-@@ -93,7 +93,7 @@
-   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
- 
-   const int loops = 2 * BUFSIZ / wlen;
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   FILE* file = fopen(name, "w");
-   for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -86,7 +86,7 @@
-   const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
-   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
- 
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   FILE* file = fopen(name, "w");
-   fwrite(cstr, 1, clen, file);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -86,7 +86,7 @@
-   const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
-   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
- 
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   FILE* file = fopen(name, "w");
-   fwrite(cstr, 1, clen, file);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -87,7 +87,7 @@
-   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
- 
-   const int loops = 2 * BUFSIZ / wlen;
--  locale loc = locale("se_NO.UTF-8");
-+  locale loc = locale("no_NO.UTF-8");
- 
-   FILE* file = fopen(name, "w");
-   for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- // Adapted from 27_io/basic_filebuf/underflow/char/2.cc
-@@ -31,7 +31,7 @@
-   bool test __attribute__((unused)) = true;
-   using namespace std;
- 
--  locale loc (locale("se_NO.UTF-8"));
-+  locale loc (locale("no_NO.UTF-8"));
-   wfilebuf fb_out, fb_in_out;
-   fb_out.pubimbue(loc);
-   fb_in_out.pubimbue(loc);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -35,7 +35,7 @@
- 
-   wfilebuf fb;
-   fb.pubsetbuf(0, 0);
--  fb.pubimbue(locale("se_NO.UTF-8"));
-+  fb.pubimbue(locale("no_NO.UTF-8"));
- 
-   FILE* file = fopen(name, "w");
-   setvbuf(file, 0, _IONBF, 0);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-05-01  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -32,7 +32,7 @@
-   bool test __attribute__((unused)) = true;
-   const char* name = "tmp_10";
- 
--  locale loc(locale("se_NO.UTF-8"));
-+  locale loc(locale("no_NO.UTF-8"));
-   locale::global(loc);
-   wcin.imbue(loc);
-   wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-05-01  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -32,7 +32,7 @@
-   bool test __attribute__((unused)) = true;
-   const char* name = "tmp_11";
- 
--  locale loc(locale("se_NO.UTF-8"));
-+  locale loc(locale("no_NO.UTF-8"));
-   locale::global(loc);
-   wcin.imbue(loc);
-   wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -37,7 +37,7 @@
-   bool test __attribute__((unused)) = true;
-   const char* name = "tmp_12";
- 
--  locale loc(locale("se_NO.UTF-8"));
-+  locale loc(locale("no_NO.UTF-8"));
-   locale::global(loc);
-   std::ios_base::sync_with_stdio(false);
-   wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
- 
- // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
- 
-@@ -36,7 +36,7 @@
-   bool test __attribute__((unused)) = true;
-   const char* name = "tmp_13";
- 
--  locale loc(locale("se_NO.UTF-8"));
-+  locale loc(locale("no_NO.UTF-8"));
-   locale::global(loc);
-   std::ios_base::sync_with_stdio(false);
-   wcin.imbue(loc);
---- libstdc++-v3/testsuite/22_locale/facet/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/facet/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "es_MX" }
-+// { dg-require-namedlocale "es_ES" }
- 
- // 2000-08-31 Benjamin Kosnik <bkoz@redhat.com>
- 
-@@ -84,7 +84,7 @@
-   // 4: Named locale should destroy facets when it goes out of scope.
-   // Not quite sure how to test for this w/o valgrind at the moment.
-   {
--    locale loc03 = locale("es_MX");
-+    locale loc03 = locale("es_ES");
-   }
- }
- 
---- libstdc++-v3/testsuite/22_locale/locale/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_PH" }
-+// { dg-require-namedlocale "en_NZ" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "it_IT" }
- 
-@@ -75,21 +75,21 @@
-     }
-   setenv("LC_ALL", "", 1);
- 
--  // Check that a "en_PH" LC_ALL is equivalent to "en_PH".
--  if (!setenv("LC_ALL", "en_PH", 1))
-+  // Check that a "en_NZ" LC_ALL is equivalent to "en_PH".
-+  if (!setenv("LC_ALL", "en_NZ", 1))
-     {
-       locale loc = locale("");
--      VERIFY( loc.name() == "en_PH" );
-+      VERIFY( loc.name() == "en_NZ" );
-     }
-   setenv("LC_ALL", "", 1);
- 
-   // Explicit check that LC_ALL sets regardless of LC_* and LANG.
--  if (!setenv("LANG", "es_MX", 1) && !setenv("LC_COLLATE", "de_DE", 1))
-+  if (!setenv("LANG", "es_ES", 1) && !setenv("LC_COLLATE", "de_DE", 1))
-     {
--      if (!setenv("LC_ALL", "en_PH", 1))
-+      if (!setenv("LC_ALL", "en_NZ", 1))
- 	{
- 	  locale loc = locale("");
--	  VERIFY( loc.name() == "en_PH" );
-+	  VERIFY( loc.name() == "en_NZ" );
- 	}
-       setenv("LC_ALL", "", 1);
-       setenv("LANG", LANG_orig ? LANG_orig : "", 1);
---- libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc
-@@ -1,5 +1,5 @@
--// { dg-require-namedlocale "en_PH" }
--// { dg-require-namedlocale "es_MX" }
-+// { dg-require-namedlocale "en_NZ" }
-+// { dg-require-namedlocale "es_ES" }
- 
- // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
- 
-@@ -32,8 +32,8 @@
-   using namespace std;
-   bool test __attribute__((unused)) = true;
-   
--  const string ph("en_PH");
--  const string mx("es_MX");
-+  const string ph("en_NZ");
-+  const string mx("es_ES");
-   const char* orig = setlocale(LC_ALL, 0);
-   const char* testph = setlocale(LC_ALL, ph.c_str());
-   const char* testmx = setlocale(LC_ALL, mx.c_str());
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ru_RU.ISO-8859-5" }
-+// { dg-require-namedlocale "ru_RU.ISO8859-5" }
- 
- // Copyright (C) 2010-2014 Free Software Foundation, Inc.
- //
-@@ -33,7 +33,7 @@
-   typedef istreambuf_iterator<char> iterator_type;
- 
-   // basic construction
--  locale loc("ru_RU.ISO-8859-5");
-+  locale loc("ru_RU.ISO8859-5");
- 
-   // create an ostream-derived object, cache the time_get facet
-   iterator_type end;
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ru_RU.UTF8" }
-+// { dg-require-namedlocale "ru_RU.UTF-8" }
- 
- // 2010-01-05  Paolo Carlini  <paolo.carlini@oracle.com>
- 
-@@ -34,7 +34,7 @@
-   typedef istreambuf_iterator<char> iterator_type;
- 
-   // basic construction
--  locale loc("ru_RU.UTF8");
-+  locale loc("ru_RU.UTF-8");
- 
-   // create an ostream-derived object, cache the time_get facet
-   iterator_type end;