From: Corentin Gay Date: Mon, 24 Aug 2020 02:18:48 +0000 (-0300) Subject: Fix libstdc++ testsuite to handle VxWorks gthreads implementation X-Git-Tag: basepoints/gcc-12~5442 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e42d2f4cf44f673e147f94bd15609cc1b94b826;p=thirdparty%2Fgcc.git Fix libstdc++ testsuite to handle VxWorks gthreads implementation When implementing the support for gthreads in VxWorks, we stumbled on a problem in the testsuite. In the libstdc++ testsuite, we indiscriminately add the `-pthread` switch to the tests that require linking against the pthread library. In certain cases, such as VxWorks, the gthread interface relies on the system native threads lilbrary and the `-pthread` switch does not exist. This patch adds a condition for the use of the `-pthread` switch. It adds it only if the target supports it. The patch also adds `dg-require-gthreads` in tests that were lacking it. for libstdc++-v3/ChangeLog * testsuite/20_util/shared_ptr/atomic/3.cc: Do not require POSIX threads and add -pthread only on targets supporting them. * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Likewise. * testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise. * testsuite/30_threads/async/42819.cc: Likewise. * testsuite/30_threads/async/49668.cc: Likewise. * testsuite/30_threads/async/54297.cc: Likewise. * testsuite/30_threads/async/any.cc: Likewise. * testsuite/30_threads/async/async.cc: Likewise. * testsuite/30_threads/async/except.cc: Likewise. * testsuite/30_threads/async/launch.cc: Likewise. * testsuite/30_threads/async/lwg2021.cc: Likewise. * testsuite/30_threads/async/sync.cc: Likewise. : Likewise. * testsuite/30_threads/call_once/39909.cc: Likewise. * testsuite/30_threads/call_once/49668.cc: Likewise. * testsuite/30_threads/call_once/60497.cc: Likewise. * testsuite/30_threads/call_once/call_once1.cc: Likewise. * testsuite/30_threads/call_once/dr2442.cc: Likewise. * testsuite/30_threads/condition_variable/54185.cc: Likewise. * testsuite/30_threads/condition_variable/cons/1.cc: Likewise. * testsuite/30_threads/condition_variable/members/1.cc: Likewise. * testsuite/30_threads/condition_variable/members/2.cc: Likewise. * testsuite/30_threads/condition_variable/members/3.cc: Likewise. * testsuite/30_threads/condition_variable/members/53841.cc: Likewise. * testsuite/30_threads/condition_variable/members/68519.cc: Likewise. * testsuite/30_threads/condition_variable/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/condition_variable_any/50862.cc: Likewise. * testsuite/30_threads/condition_variable_any/53830.cc: Likewise. * testsuite/30_threads/condition_variable_any/cond.cc: Likewise. * testsuite/30_threads/condition_variable_any/cons/1.cc: Likewise. * testsuite/30_threads/condition_variable_any/members/1.cc: Likewise. * testsuite/30_threads/condition_variable_any/members/2.cc: Likewise. * testsuite/30_threads/future/cons/move.cc: Likewise. * testsuite/30_threads/future/members/45133.cc: Likewise. * testsuite/30_threads/future/members/get.cc: Likewise. * testsuite/30_threads/future/members/get2.cc: Likewise. * testsuite/30_threads/future/members/share.cc: Likewise. * testsuite/30_threads/future/members/valid.cc: Likewise. * testsuite/30_threads/future/members/wait.cc: Likewise. * testsuite/30_threads/future/members/wait_for.cc: Likewise. * testsuite/30_threads/future/members/wait_until.cc: Likewise. * testsuite/30_threads/lock/1.cc: Likewise. * testsuite/30_threads/lock/2.cc: Likewise. * testsuite/30_threads/lock/3.cc: Likewise. * testsuite/30_threads/lock/4.cc: Likewise. * testsuite/30_threads/mutex/cons/1.cc: Likewise. * testsuite/30_threads/mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/mutex/lock/1.cc: Likewise. * testsuite/30_threads/mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/mutex/unlock/1.cc: Likewise. * testsuite/30_threads/mutex/unlock/2.cc: Likewise. * testsuite/30_threads/packaged_task/49668.cc: Likewise. * testsuite/30_threads/packaged_task/60564.cc: Likewise. * testsuite/30_threads/packaged_task/cons/1.cc: Likewise. * testsuite/30_threads/packaged_task/cons/2.cc: Likewise. * testsuite/30_threads/packaged_task/cons/3.cc: Likewise. * testsuite/30_threads/packaged_task/cons/56492.cc: Likewise. * testsuite/30_threads/packaged_task/cons/alloc.cc: Likewise. * testsuite/30_threads/packaged_task/cons/move.cc: Likewise. * testsuite/30_threads/packaged_task/cons/move_assign.cc: Likewise. * testsuite/30_threads/packaged_task/members/at_thread_exit.cc: Likewise. * testsuite/30_threads/packaged_task/members/get_future.cc: Likewise. * testsuite/30_threads/packaged_task/members/get_future2.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke2.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke3.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke4.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke5.cc: Likewise. * testsuite/30_threads/packaged_task/members/reset.cc: Likewise. * testsuite/30_threads/packaged_task/members/reset2.cc: Likewise. * testsuite/30_threads/packaged_task/members/swap.cc: Likewise. * testsuite/30_threads/packaged_task/members/valid.cc: Likewise. * testsuite/30_threads/promise/60966.cc: Likewise. * testsuite/30_threads/promise/cons/1.cc: Likewise. * testsuite/30_threads/promise/cons/alloc.cc: Likewise. * testsuite/30_threads/promise/cons/move.cc: Likewise. * testsuite/30_threads/promise/cons/move_assign.cc: Likewise. * testsuite/30_threads/promise/members/at_thread_exit.cc: Likewise. * testsuite/30_threads/promise/members/at_thread_exit2.cc: Likewise. * testsuite/30_threads/promise/members/get_future.cc: Likewise. * testsuite/30_threads/promise/members/get_future2.cc: Likewise. * testsuite/30_threads/promise/members/set_exception.cc: Likewise. * testsuite/30_threads/promise/members/set_exception2.cc: Likewise. * testsuite/30_threads/promise/members/set_value.cc: Likewise. * testsuite/30_threads/promise/members/set_value2.cc: Likewise. * testsuite/30_threads/promise/members/set_value3.cc: Likewise. * testsuite/30_threads/promise/members/swap.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/recursive_mutex/lock/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/recursive_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/recursive_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/unlock/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/lock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/lock/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/unlock/2.cc: Likewise. * testsuite/30_threads/shared_future/cons/move.cc: Likewise. * testsuite/30_threads/shared_future/members/45133.cc: Likewise. * testsuite/30_threads/shared_future/members/get.cc: Likewise. * testsuite/30_threads/shared_future/members/get2.cc: Likewise. * testsuite/30_threads/shared_future/members/valid.cc: Likewise. * testsuite/30_threads/shared_future/members/wait.cc: Likewise. * testsuite/30_threads/shared_future/members/wait_for.cc: Likewise. * testsuite/30_threads/shared_future/members/wait_until.cc: Likewise. * testsuite/30_threads/shared_lock/cons/1.cc: Likewise. * testsuite/30_threads/shared_lock/cons/2.cc: Likewise. * testsuite/30_threads/shared_lock/cons/3.cc: Likewise. * testsuite/30_threads/shared_lock/cons/4.cc: Likewise. * testsuite/30_threads/shared_lock/cons/5.cc: Likewise. * testsuite/30_threads/shared_lock/cons/6.cc: Likewise. * testsuite/30_threads/shared_lock/locking/1.cc: Likewise. * testsuite/30_threads/shared_lock/locking/2.cc: Likewise. * testsuite/30_threads/shared_lock/locking/3.cc: Likewise. * testsuite/30_threads/shared_lock/locking/4.cc: Likewise. * testsuite/30_threads/shared_lock/modifiers/1.cc: Likewise. * testsuite/30_threads/shared_mutex/cons/1.cc: Likewise. * testsuite/30_threads/shared_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/shared_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/shared_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/shared_timed_mutex/cons/1.cc: Likewise. * testsuite/30_threads/shared_timed_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/shared_timed_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/shared_timed_mutex/try_lock/3.cc: Likewise. * testsuite/30_threads/shared_timed_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/this_thread/1.cc: Likewise. * testsuite/30_threads/this_thread/sleep_for-mt.cc: Likewise. * testsuite/30_threads/this_thread/sleep_until-mt.cc: Likewise. * testsuite/30_threads/thread/cons/1.cc: Likewise. * testsuite/30_threads/thread/cons/2.cc: Likewise. * testsuite/30_threads/thread/cons/3.cc: Likewise. * testsuite/30_threads/thread/cons/4.cc: Likewise. * testsuite/30_threads/thread/cons/49668.cc: Likewise. * testsuite/30_threads/thread/cons/5.cc: Likewise. * testsuite/30_threads/thread/cons/6.cc: Likewise. * testsuite/30_threads/thread/cons/7.cc: Likewise. * testsuite/30_threads/thread/cons/8.cc: Likewise. * testsuite/30_threads/thread/cons/9.cc: Likewise. * testsuite/30_threads/thread/cons/moveable.cc: Likewise. * testsuite/30_threads/thread/cons/terminate.cc: Likewise. * testsuite/30_threads/thread/members/1.cc: Likewise. * testsuite/30_threads/thread/members/2.cc: Likewise. * testsuite/30_threads/thread/members/3.cc: Likewise. * testsuite/30_threads/thread/members/4.cc: Likewise. * testsuite/30_threads/thread/members/5.cc: Likewise. * testsuite/30_threads/thread/members/hardware_concurrency.cc: Likewise. * testsuite/30_threads/thread/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/thread/swap/1.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/1.cc: Likewise. * testsuite/30_threads/timed_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/timed_mutex/lock/1.cc: Likewise. * testsuite/30_threads/timed_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/timed_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/2.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/3.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_until/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_until/2.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_until/57641.cc: Likewise. * testsuite/30_threads/timed_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/timed_mutex/unlock/2.cc: Likewise. * testsuite/30_threads/try_lock/1.cc: Likewise. * testsuite/30_threads/try_lock/2.cc: Likewise. * testsuite/30_threads/try_lock/3.cc: Likewise. * testsuite/30_threads/try_lock/4.cc: Likewise. * testsuite/30_threads/unique_lock/cons/1.cc: Likewise. * testsuite/30_threads/unique_lock/cons/2.cc: Likewise. * testsuite/30_threads/unique_lock/cons/3.cc: Likewise. * testsuite/30_threads/unique_lock/cons/4.cc: Likewise. * testsuite/30_threads/unique_lock/cons/5.cc: Likewise. * testsuite/30_threads/unique_lock/cons/6.cc: Likewise. * testsuite/30_threads/unique_lock/locking/1.cc: Likewise. * testsuite/30_threads/unique_lock/locking/2.cc: Likewise. * testsuite/30_threads/unique_lock/locking/3.cc: Likewise. * testsuite/30_threads/unique_lock/locking/4.cc: Likewise. * testsuite/30_threads/unique_lock/modifiers/1.cc: Likewise. --- diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/3.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/3.cc index 144060c4785b..c256239f1255 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/3.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc index 7f324c6e107b..a085a4083521 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc @@ -18,10 +18,10 @@ // 20.6.6.2 Template class shared_ptr [util.smartptr.shared] // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-add-options libatomic } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // { dg-require-cstdint "" } #include diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc index bdc60c6a9054..71a7b15e4fb4 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc @@ -18,10 +18,10 @@ // 20.6.6.2 Template class shared_ptr [util.smartptr.shared] // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-add-options libatomic } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // { dg-require-cstdint "" } #include diff --git a/libstdc++-v3/testsuite/30_threads/async/42819.cc b/libstdc++-v3/testsuite/30_threads/async/42819.cc index 8f9db3b8ad9e..15ac4da54b86 100644 --- a/libstdc++-v3/testsuite/30_threads/async/42819.cc +++ b/libstdc++-v3/testsuite/30_threads/async/42819.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/49668.cc b/libstdc++-v3/testsuite/30_threads/async/49668.cc index ae11ca4c6c3c..ba402c09a131 100644 --- a/libstdc++-v3/testsuite/30_threads/async/49668.cc +++ b/libstdc++-v3/testsuite/30_threads/async/49668.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/54297.cc b/libstdc++-v3/testsuite/30_threads/async/54297.cc index c904829a610c..9ef3c73fa6cb 100644 --- a/libstdc++-v3/testsuite/30_threads/async/54297.cc +++ b/libstdc++-v3/testsuite/30_threads/async/54297.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-sleep "" } diff --git a/libstdc++-v3/testsuite/30_threads/async/any.cc b/libstdc++-v3/testsuite/30_threads/async/any.cc index 7fec2db9e8be..7651b2cc5922 100644 --- a/libstdc++-v3/testsuite/30_threads/async/any.cc +++ b/libstdc++-v3/testsuite/30_threads/async/any.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/async.cc b/libstdc++-v3/testsuite/30_threads/async/async.cc index 7fa9b030a408..8c3a0c18768a 100644 --- a/libstdc++-v3/testsuite/30_threads/async/async.cc +++ b/libstdc++-v3/testsuite/30_threads/async/async.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/except.cc b/libstdc++-v3/testsuite/30_threads/async/except.cc index 9b68c42dcb96..faddc8878373 100644 --- a/libstdc++-v3/testsuite/30_threads/async/except.cc +++ b/libstdc++-v3/testsuite/30_threads/async/except.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/launch.cc b/libstdc++-v3/testsuite/30_threads/async/launch.cc index 13c9bdfee640..77b6dc90da9c 100644 --- a/libstdc++-v3/testsuite/30_threads/async/launch.cc +++ b/libstdc++-v3/testsuite/30_threads/async/launch.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc b/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc index 55968afa88d1..b6e882036889 100644 --- a/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc +++ b/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc @@ -16,9 +16,8 @@ // . // { dg-do compile } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // LWG 2021. Further incorrect usages of result_of diff --git a/libstdc++-v3/testsuite/30_threads/async/sync.cc b/libstdc++-v3/testsuite/30_threads/async/sync.cc index eb0fde3ce838..572134a6d50a 100644 --- a/libstdc++-v3/testsuite/30_threads/async/sync.cc +++ b/libstdc++-v3/testsuite/30_threads/async/sync.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/call_once/39909.cc b/libstdc++-v3/testsuite/30_threads/call_once/39909.cc index 01bcb1dec4df..1f35d7f8b9a1 100644 --- a/libstdc++-v3/testsuite/30_threads/call_once/39909.cc +++ b/libstdc++-v3/testsuite/30_threads/call_once/39909.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/call_once/49668.cc b/libstdc++-v3/testsuite/30_threads/call_once/49668.cc index 67ef6cbd7cd5..7eb5426a822a 100644 --- a/libstdc++-v3/testsuite/30_threads/call_once/49668.cc +++ b/libstdc++-v3/testsuite/30_threads/call_once/49668.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/call_once/60497.cc b/libstdc++-v3/testsuite/30_threads/call_once/60497.cc index 129a2bc7babc..9955a9eebed3 100644 --- a/libstdc++-v3/testsuite/30_threads/call_once/60497.cc +++ b/libstdc++-v3/testsuite/30_threads/call_once/60497.cc @@ -1,7 +1,6 @@ // { dg-do compile } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc b/libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc index 9f8567007e90..26cfa576e811 100644 --- a/libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc +++ b/libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/call_once/dr2442.cc b/libstdc++-v3/testsuite/30_threads/call_once/dr2442.cc index 4126c54910cf..289471015199 100644 --- a/libstdc++-v3/testsuite/30_threads/call_once/dr2442.cc +++ b/libstdc++-v3/testsuite/30_threads/call_once/dr2442.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2016-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc index ea0d5bb87402..3d044c1bef34 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc index a8b41dd2f956..79104e1277c2 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc index 98b1daddb0d5..6cf336ff46d5 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc index c671804b4064..744e0b8c41ec 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/members/3.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/members/3.cc index 4cd0fb89648d..079b0242d62a 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/members/3.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/members/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc index 12b9d12a65ab..096a0da88bdb 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc @@ -1,7 +1,6 @@ // { dg-do compile } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/members/68519.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/members/68519.cc index 9a70713a1bb0..2a6ecb95fd1d 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/members/68519.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/members/68519.cc @@ -16,9 +16,8 @@ // . // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } #include diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc index be1923a1958a..deac6812290f 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc index fef0ce82aad0..92781148e38d 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-sched-yield "" } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc index 53b1d20e6224..8b0c87b213b8 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-sched-yield "" } // { dg-require-sleep "" } diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc index 122bb13f253c..6b994d0177f7 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2018-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc index d3e1cf4914a8..5db804a4c7e0 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc index bc254c3f3cc0..c21fc5a2edf6 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc index 9d75a7664b33..5d822d783381 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/cons/move.cc b/libstdc++-v3/testsuite/30_threads/future/cons/move.cc index 77c551e02782..26a59d2ab417 100644 --- a/libstdc++-v3/testsuite/30_threads/future/cons/move.cc +++ b/libstdc++-v3/testsuite/30_threads/future/cons/move.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/45133.cc b/libstdc++-v3/testsuite/30_threads/future/members/45133.cc index 54e7cb9ea365..d27bbd54e278 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/45133.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/45133.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/get.cc b/libstdc++-v3/testsuite/30_threads/future/members/get.cc index a8840089bd74..537f176c6968 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/get.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/get.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/get2.cc b/libstdc++-v3/testsuite/30_threads/future/members/get2.cc index 27dbb181f9a7..8550fe41669a 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/get2.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/get2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/share.cc b/libstdc++-v3/testsuite/30_threads/future/members/share.cc index c0ea49fdd54a..1eff6ac96ca4 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/share.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/share.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/valid.cc b/libstdc++-v3/testsuite/30_threads/future/members/valid.cc index 3f540eccc38e..bc000bd1be22 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/valid.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/valid.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/wait.cc b/libstdc++-v3/testsuite/30_threads/future/members/wait.cc index e6a8af8cbb2e..f3d6666975ea 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/wait.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/wait.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc b/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc index aa0ac33450b2..4bd603f47f72 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc b/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc index 4137bc0ed9b6..1742fe6cfca4 100644 --- a/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc +++ b/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/lock/1.cc b/libstdc++-v3/testsuite/30_threads/lock/1.cc index 285e3c11bb6f..8c5cc9a02b89 100644 --- a/libstdc++-v3/testsuite/30_threads/lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/lock/2.cc b/libstdc++-v3/testsuite/30_threads/lock/2.cc index b4e1e1c1cac2..977ffba2b675 100644 --- a/libstdc++-v3/testsuite/30_threads/lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/lock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/lock/3.cc b/libstdc++-v3/testsuite/30_threads/lock/3.cc index 18fd009c9fff..6185ffec306e 100644 --- a/libstdc++-v3/testsuite/30_threads/lock/3.cc +++ b/libstdc++-v3/testsuite/30_threads/lock/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/lock/4.cc b/libstdc++-v3/testsuite/30_threads/lock/4.cc index 01b3c1776a30..f31b2dd48845 100644 --- a/libstdc++-v3/testsuite/30_threads/lock/4.cc +++ b/libstdc++-v3/testsuite/30_threads/lock/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc index 7f6cbed76161..ddd7d5d437ca 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc b/libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc index 25bce6b907e9..ee1b3a87853d 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc b/libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc index d08acf8986f2..3e9d24fbed8f 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc index 9bc64b389f82..af7d9949445a 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc index 87ab41f61695..5ddf6528ef53 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc index 56340bc82217..cc667991adc7 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc index 527c0103f16b..afeb5538b781 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc index fb0da362e386..5777e2b9f070 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/mutex/unlock/2.cc b/libstdc++-v3/testsuite/30_threads/mutex/unlock/2.cc index bbe04c6ae8fa..b9a811679b6a 100644 --- a/libstdc++-v3/testsuite/30_threads/mutex/unlock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/mutex/unlock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc index 2f84cea77059..aa1336893acc 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc index 66aff7c7375c..a8dd60e6de39 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc index d8c2dfcd27da..31317586f92c 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc index 2090224e988b..1d305ad9afcc 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc index dad645c9157b..e354b987cb7c 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc index 10fa622d7db9..e199a4652448 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc @@ -1,7 +1,6 @@ // { dg-do compile } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc index 4e0ca335f56f..dbe477ad1bf5 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc @@ -1,6 +1,6 @@ -// { dg-do run { target { c++11_only || c++14_only } } } -// { dg-options "-pthread" } -// { dg-require-effective-target pthread } +// { dg-do run } +// { dg-additional-options "-pthread" { target pthread } } +// { dg-require-effective-target c++11 } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc index 2ccc89cbee9d..d7b1ce73dbc7 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc index db55da7422a2..38a0e8cbf322 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc index 6b6aca9bbdba..725f9b0b9bdb 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc index 0127873ea158..9a98e21b71ea 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc index 0a9c100d46e5..9899583dba80 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc index 588153268cab..b178e91b2267 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc index 436ba70fa66c..13d6a373d4b4 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc index 6416786259c1..08759c23f2d0 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc index 5f390122d202..5da2a7926d8b 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc index 84c0ac3230fa..984bf4f55610 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc index 8eea7f51d9aa..f746e2346c92 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc index 35811e265881..0bcaf9be4cf9 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc index 601f4234bce5..e79be75acd71 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc index 5b599b533d7f..5a08c090a2ea 100644 --- a/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/60966.cc b/libstdc++-v3/testsuite/30_threads/promise/60966.cc index 6de0e3520f0c..445422f841db 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/60966.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/60966.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc index 1d9e9431496c..4c3f25a76efb 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc index ca752305f282..6d3d85918c1a 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc index 1458b134a6ce..ca67d30e1247 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc index f5719b49b05a..848b9a8b9dea 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc b/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc index 7bdfcdc13bed..29c5156890d9 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit2.cc index 59eeae823ecc..53e87c86ee05 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit2.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc b/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc index 5985166cdfe8..fd946556fc1a 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc index 016f9185164c..246074a913c0 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc index 282e1f1e6733..94df89e0c120 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc index 25850d0389b4..7a925f06cd1c 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc index b4b4771470e7..b523c6b5aadd 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc index 86492aa28466..f4cba4a1446f 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc index f778b36ddb7b..5fb10e9e3744 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc b/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc index 81bab94f19ad..b5f75805db20 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc index 84d0cb6554d4..84813c2512f3 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc index 20041b00debd..22ad0416a0a5 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc index ff849501961a..e430098c768a 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc index b4fe115a2ce9..ddaae57b84f4 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc index 2c15feeeafd1..5ad76a4fe32e 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc index a797d778cf64..81b95edd6c16 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc index e6ed94720fe6..0be6b0d183e9 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc index 79ee4080756a..c98345a2249e 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/2.cc index eec5174b3cd1..64ffe5529c74 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc index 1f16d1ad4b5e..997c8514c365 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc index 974c6abd949c..62f03ed18968 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc index 5db96bcea448..4cee87acebf8 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc index 56b207390d21..180e3cd1f813 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc index 4131489529fb..2067b1d87b04 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads-timed "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc index 2a1d72783e75..df9820541e56 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads-timed "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc index 79780d69ceeb..dec1c597361d 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc index fd3bccfb1b36..12b42a14e22b 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc index 802c8dffac73..dc3aa59c025d 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc index eaf57e80af5d..d18ff0748b96 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc index 8d5131f3db39..c785b8531051 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc index 79780d69ceeb..dec1c597361d 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc index ff6a35b4cebb..a5ccbb5a5ae5 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc index 56225c5950ac..fc432ae6f95f 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/2.cc b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/2.cc index 4a1b62a78c83..cf041749f9d8 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc b/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc index d1d7b1a91428..cbf19d9c9ef5 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc index 0771dccc1dc2..ce44036a26f3 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc index 621c79be7d8a..a89864bd08ae 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc index dbbeae19a616..0ff6618c1ea3 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc index 937f67ec0cd7..69a4a3b77147 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc index 55e5b9664031..c01e4290a4bb 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc index 50e7da0a333a..62cf3584a1ee 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc index 93c09ef0f99b..e126cd4d2fba 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc index 8b119820d975..f30058e64e67 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc index 020e1272282c..1f8cca28b7d8 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc index b55774f64682..ec3dc47313f5 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc index d7efb38ebc9a..929b836dfc3d 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc index 4d4bab351ccd..ff866b5fa107 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc index f5312660d85d..92b4a1840d16 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc index 3775fc9e3f2c..2eef39181e93 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc index 95c6d0c9c2b3..8e59820d2ccb 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc index 1d04da6dd7fb..90e73e88bb3d 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc index 46e060b98b85..0574995417a5 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc index cf08302c1adf..ca5a1f123ffd 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc index ea177c080848..635452bdfbfb 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc @@ -1,6 +1,6 @@ -// { dg-options "-std=gnu++17 -pthread" } +// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } -// { dg-require-effective-target pthread } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc index c1a3cd6cae6f..eb41bf261366 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc @@ -1,6 +1,6 @@ -// { dg-options "-std=gnu++17 -pthread" } +// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } -// { dg-require-effective-target pthread } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc index d5d5e10084ff..b4b96b3377ad 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc @@ -1,6 +1,6 @@ -// { dg-options "-std=gnu++17 -pthread" } +// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } -// { dg-require-effective-target pthread } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc index 146d8c20c60f..939c0f0388c9 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/unlock/1.cc @@ -1,6 +1,6 @@ -// { dg-options "-std=gnu++17 -pthread" } +// { dg-options "-std=gnu++17" } // { dg-do run { target c++17 } } -// { dg-require-effective-target pthread } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/cons/1.cc index 987c01ea85ac..abfb979604be 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/1.cc index 566d40514106..29ffdeea31ee 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/2.cc index 5b85d3c49c8b..3123630175da 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/3.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/3.cc index 82cd113e2aff..ca8f1dd1e539 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/3.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/try_lock/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/unlock/1.cc index 1c5dc314b45b..4a7b5fe01357 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/unlock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++14 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/this_thread/1.cc b/libstdc++-v3/testsuite/30_threads/this_thread/1.cc index 2d99b8bc8038..5ee8092589cd 100644 --- a/libstdc++-v3/testsuite/30_threads/this_thread/1.cc +++ b/libstdc++-v3/testsuite/30_threads/this_thread/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/this_thread/sleep_for-mt.cc b/libstdc++-v3/testsuite/30_threads/this_thread/sleep_for-mt.cc index 45993811d010..6eb4ca8a50f3 100644 --- a/libstdc++-v3/testsuite/30_threads/this_thread/sleep_for-mt.cc +++ b/libstdc++-v3/testsuite/30_threads/this_thread/sleep_for-mt.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-sleep "" } diff --git a/libstdc++-v3/testsuite/30_threads/this_thread/sleep_until-mt.cc b/libstdc++-v3/testsuite/30_threads/this_thread/sleep_until-mt.cc index fc8d10d84481..95165b992b21 100644 --- a/libstdc++-v3/testsuite/30_threads/this_thread/sleep_until-mt.cc +++ b/libstdc++-v3/testsuite/30_threads/this_thread/sleep_until-mt.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-sleep "" } diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/1.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/1.cc index a7e91b1da569..0062e0d74587 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/2.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/2.cc index 1b2cf8598cc5..5d1109710176 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/2.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/3.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/3.cc index 1d86423f5ae8..9387738f8a9e 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/3.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/4.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/4.cc index f77b3c54c64c..443eb5327b99 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/4.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc index 057aa655dc98..f5fdbbc02ab7 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/5.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/5.cc index 9d6921a6be67..2c7b0a0c1436 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/5.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/5.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/6.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/6.cc index e215ed1d5509..2c36e7b91adb 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/6.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/6.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/7.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/7.cc index e83fba3723c4..50b14aeda4f9 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/7.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/7.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/8.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/8.cc index 3ff6ac92f5e8..2da704a1b05d 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/8.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/8.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/9.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/9.cc index de7961826321..46bb7c9327a6 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/9.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/9.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc index a3401cdeefb4..a94e599df14c 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/cons/terminate.cc b/libstdc++-v3/testsuite/30_threads/thread/cons/terminate.cc index 6e71e95f21cd..c402e450f4b9 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/cons/terminate.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/cons/terminate.cc @@ -16,9 +16,8 @@ // . // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } #include diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/1.cc b/libstdc++-v3/testsuite/30_threads/thread/members/1.cc index 9197d5345a72..e08c89b2dca9 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/1.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/2.cc b/libstdc++-v3/testsuite/30_threads/thread/members/2.cc index 72f3c142f3cd..5735398dc661 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/2.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/3.cc b/libstdc++-v3/testsuite/30_threads/thread/members/3.cc index 8390f995167c..1ca378723113 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/3.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/4.cc b/libstdc++-v3/testsuite/30_threads/thread/members/4.cc index 1c7a64287927..e2445abc2c2d 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/4.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/5.cc b/libstdc++-v3/testsuite/30_threads/thread/members/5.cc index f2c9243a7c1c..a23c58bc0917 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/5.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/5.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc b/libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc index bf3fc6d169cb..e8ae5ac8ee30 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // { dg-require-nprocs "" } diff --git a/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc index c3ed9387b7cc..403f2980d351 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/thread/swap/1.cc b/libstdc++-v3/testsuite/30_threads/thread/swap/1.cc index 22f501d0c2b2..881de0084023 100644 --- a/libstdc++-v3/testsuite/30_threads/thread/swap/1.cc +++ b/libstdc++-v3/testsuite/30_threads/thread/swap/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc index d26dea82a3b5..6442c2c8fd44 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc index 5c7cde1bec16..27e8bc56a054 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc index 25fb2f3c4ba0..dbe3c89554fc 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc index 446b9c3128dc..c4b94dc3fb1b 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads-timed "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc index 07e95ae2b4a6..3850183b4fa6 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads-timed "" } // Copyright (C) 2009-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc index f8578154d799..7fe759e73217 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc index 1e7717940612..04ffeb08179a 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc index e0ab8b7eb5eb..e798ac77ca91 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc index 186951bdcc3e..4e37045bf352 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // { dg-require-cstdint "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc index 40b4ed093982..dd6174ab3c77 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc index f8578154d799..7fe759e73217 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc index 1e7717940612..04ffeb08179a 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/57641.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/57641.cc index fbdfb82cb5bd..9ea5607ceff5 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/57641.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/57641.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2013-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc index ae41c40ccafa..baf72b77eae5 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/2.cc b/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/2.cc index 74a833aaac83..2aad347707ab 100644 --- a/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/try_lock/1.cc index 67df1f76310c..212dbd9a91d3 100644 --- a/libstdc++-v3/testsuite/30_threads/try_lock/1.cc +++ b/libstdc++-v3/testsuite/30_threads/try_lock/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/try_lock/2.cc index 5459e23271a5..9cbfe6498841 100644 --- a/libstdc++-v3/testsuite/30_threads/try_lock/2.cc +++ b/libstdc++-v3/testsuite/30_threads/try_lock/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/3.cc b/libstdc++-v3/testsuite/30_threads/try_lock/3.cc index f31bff854173..cd0a30e33382 100644 --- a/libstdc++-v3/testsuite/30_threads/try_lock/3.cc +++ b/libstdc++-v3/testsuite/30_threads/try_lock/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/4.cc b/libstdc++-v3/testsuite/30_threads/try_lock/4.cc index 1ed78889c1c6..3427a0db6638 100644 --- a/libstdc++-v3/testsuite/30_threads/try_lock/4.cc +++ b/libstdc++-v3/testsuite/30_threads/try_lock/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2010-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc index cebeb6b7f02a..458de09b35cd 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc index 5b969c6f19fc..26b97db9a339 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc index d8d025dc71eb..5623ee0cc4e4 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc index 5d9ac203687e..c77d3b5af1d6 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc index 32625cf201ec..801bbbe999fe 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc index 50f4fc8f7619..cb51e7219824 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc index ba901d65d3be..b3edb292e3af 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc index 3b4c6e7946da..c443a0284ae3 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc index 135b6ffd5dc3..1a9436596330 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc index f526d9a06960..9867d9312c1c 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc @@ -1,7 +1,7 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } +// { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc b/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc index adee63cd2a1a..e0c65ed205fc 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc @@ -1,7 +1,6 @@ // { dg-do run } -// { dg-options "-pthread" } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-effective-target c++11 } -// { dg-require-effective-target pthread } // { dg-require-gthreads "" } // Copyright (C) 2008-2020 Free Software Foundation, Inc.