# DP: Proposed patch for PR libstdc++/64735

commit e81e908deb699886e65cb4d614f6a0a1cf54662f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Dec 16 15:22:21 2016 +0000

    PR64735 support exception propagation without atomics
    
    2016-11-09  Pauli Nieminen  <suokkos@gmail.com>
    	    Jonathan Wakely  <jwakely@redhat.com>
    
    	PR libstdc++/64735
    	* include/std/future: Remove check for ATOMIC_INT_LOCK_FREE
    	* libsupc++/eh_atomics.h: New file for internal use only.
    	(__eh_atomic_inc, __eh_atomic_dec): New.
    	* libsupc++/eh_ptr.cc (exception_ptr::_M_addref)
    	(exception_ptr::_M_release) (__gxx_dependent_exception_cleanup)
    	(rethrow_exception): Use eh_atomics.h reference counting helpers.
    	* libsupc++/eh_throw.cc (__gxx_exception_cleanup): Likewise.
    	* libsupc++/eh_tm.cc (free_any_cxa_exception): Likewise.
    	* libsupc++/exception: Remove check for ATOMIC_INT_LOCK_FREE.
    	* libsupc++/exception_ptr.h: Likewise.
    	* libsupc++/guard.cc: Include header for ATOMIC_INT_LOCK_FREE macro.
    	* libsupc++/nested_exception.cc: Remove check for
    	ATOMIC_INT_LOCK_FREE.
    	* libsupc++/nested_exception.h: Likewise.
    	* src/c++11/future.cc: Likewise.
    	* testsuite/18_support/exception_ptr/*: Remove atomic builtins checks.
    	* testsuite/18_support/nested_exception/*: Likewise.
    	* testsuite/30_threads/async/*: Likewise.
    	* testsuite/30_threads/future/*: Likewise.
    	* testsuite/30_threads/headers/future/types_std_c++0x.cc: Likewise.
    	* testsuite/30_threads/packaged_task/*: Likewise.
    	* testsuite/30_threads/promise/*: Likewise.
    	* testsuite/30_threads/shared_future/*: Likewise.

#Index: b/src/libstdc++-v3/include/std/future
#===================================================================
#--- a/src/libstdc++-v3/include/std/future
#+++ b/src/libstdc++-v3/include/std/future
#@@ -182,8 +182,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#     future<__async_result_of<_Fn, _Args...>>
#     async(_Fn&& __fn, _Args&&... __args);
# 
#-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
#-  && (ATOMIC_INT_LOCK_FREE > 1)
#+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
# 
#   /// Base class and enclosing scope.
#   struct __future_base
#@@ -1745,7 +1744,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
# 
# #endif // _GLIBCXX_ASYNC_ABI_COMPAT
# #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
#-       // && ATOMIC_INT_LOCK_FREE
# 
#   // @} group futures
# _GLIBCXX_END_NAMESPACE_VERSION
Index: b/src/libstdc++-v3/libsupc++/eh_atomics.h
===================================================================
--- /dev/null
+++ b/src/libstdc++-v3/libsupc++/eh_atomics.h
@@ -0,0 +1,84 @@
+// Exception Handling support header for -*- C++ -*-
+
+// Copyright (C) 2016 Free Software Foundation, Inc.
+//
+// This file is part of GCC.
+//
+// GCC is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// GCC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file eh_atomics.h
+ *  This is an internal header file, included by library source files.
+ *  Do not attempt to use it directly.
+ */
+
+#ifndef _EH_ATOMICS_H
+#define _EH_ATOMICS_H 1
+
+#include <bits/c++config.h>
+#include <bits/atomic_word.h>
+#include <bits/atomic_lockfree_defines.h>
+#if ATOMIC_INT_LOCK_FREE <= 1
+# include <ext/atomicity.h>
+#endif
+
+#pragma GCC visibility push(default)
+extern "C++" {
+namespace __gnu_cxx
+{
+  void
+  __eh_atomic_inc (_Atomic_word* __count) __attribute__((always_inline));
+
+  bool
+  __eh_atomic_dec (_Atomic_word* __count) __attribute__((always_inline));
+
+  // Increments the count.
+  inline void
+  __eh_atomic_inc (_Atomic_word* __count)
+  {
+#if ATOMIC_INT_LOCK_FREE > 1
+    __atomic_add_fetch (__count, 1, __ATOMIC_ACQ_REL);
+#else
+    _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE (__count);
+    __gnu_cxx::__atomic_add_dispatch (__count, 1);
+    _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER (__count);
+#endif
+  }
+
+  // Decrements the count and returns true if it reached zero.
+  inline bool
+  __eh_atomic_dec (_Atomic_word* __count)
+  {
+#if ATOMIC_INT_LOCK_FREE > 1
+    return __atomic_sub_fetch (__count, 1, __ATOMIC_ACQ_REL) == 0;
+#else
+    _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE (__count);
+    if (__gnu_cxx::__exchange_and_add_dispatch (__count, -1) == 1)
+      {
+	_GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER (__count);
+	return true;
+      }
+    return false;
+#endif
+  }
+} // namespace __gnu_cxx
+}
+#pragma GCC visibility pop
+
+#endif // _EH_ATOMICS_H
Index: b/src/libstdc++-v3/libsupc++/eh_ptr.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/eh_ptr.cc
+++ b/src/libstdc++-v3/libsupc++/eh_ptr.cc
@@ -23,9 +23,7 @@
 // <http://www.gnu.org/licenses/>.
 
 #include <bits/c++config.h>
-#include <bits/atomic_lockfree_defines.h>
-
-#if ATOMIC_INT_LOCK_FREE > 1
+#include "eh_atomics.h"
 
 #define _GLIBCXX_EH_PTR_COMPAT
 
@@ -103,7 +101,7 @@ std::__exception_ptr::exception_ptr::_M_
     {
       __cxa_refcounted_exception *eh =
 	__get_refcounted_exception_header_from_obj (_M_exception_object);
-      __atomic_add_fetch (&eh->referenceCount, 1, __ATOMIC_ACQ_REL);
+      __gnu_cxx::__eh_atomic_inc (&eh->referenceCount);
     }
 }
 
@@ -115,7 +113,7 @@ std::__exception_ptr::exception_ptr::_M_
     {
       __cxa_refcounted_exception *eh =
 	__get_refcounted_exception_header_from_obj (_M_exception_object);
-      if (__atomic_sub_fetch (&eh->referenceCount, 1, __ATOMIC_ACQ_REL) == 0)
+      if (__gnu_cxx::__eh_atomic_dec (&eh->referenceCount))
         {
 	  if (eh->exc.exceptionDestructor)
 	    eh->exc.exceptionDestructor (_M_exception_object);
@@ -219,7 +217,7 @@ __gxx_dependent_exception_cleanup(_Unwin
 
   __cxa_free_dependent_exception (dep);
 
-  if (__atomic_sub_fetch (&header->referenceCount, 1, __ATOMIC_ACQ_REL) == 0)
+  if (__gnu_cxx::__eh_atomic_dec (&header->referenceCount))
     {
       if (header->exc.exceptionDestructor)
 	header->exc.exceptionDestructor (header + 1);
@@ -238,7 +236,7 @@ std::rethrow_exception(std::exception_pt
 
   __cxa_dependent_exception *dep = __cxa_allocate_dependent_exception ();
   dep->primaryException = obj;
-  __atomic_add_fetch (&eh->referenceCount, 1,  __ATOMIC_ACQ_REL);
+  __gnu_cxx::__eh_atomic_inc (&eh->referenceCount);
 
   dep->unexpectedHandler = get_unexpected ();
   dep->terminateHandler = get_terminate ();
@@ -260,5 +258,3 @@ std::rethrow_exception(std::exception_pt
 }
 
 #undef _GLIBCXX_EH_PTR_COMPAT
-
-#endif
Index: b/src/libstdc++-v3/libsupc++/eh_throw.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/eh_throw.cc
+++ b/src/libstdc++-v3/libsupc++/eh_throw.cc
@@ -24,6 +24,7 @@
 
 #include <bits/c++config.h>
 #include "unwind-cxx.h"
+#include "eh_atomics.h"
 
 using namespace __cxxabiv1;
 
@@ -42,17 +43,13 @@ __gxx_exception_cleanup (_Unwind_Reason_
   if (code != _URC_FOREIGN_EXCEPTION_CAUGHT && code != _URC_NO_REASON)
     __terminate (header->exc.terminateHandler);
 
-#if ATOMIC_INT_LOCK_FREE > 1
-  if (__atomic_sub_fetch (&header->referenceCount, 1, __ATOMIC_ACQ_REL) == 0)
+  if (__gnu_cxx::__eh_atomic_dec (&header->referenceCount))
     {
-#endif
       if (header->exc.exceptionDestructor)
 	header->exc.exceptionDestructor (header + 1);
 
       __cxa_free_exception (header + 1);
-#if ATOMIC_INT_LOCK_FREE > 1
     }
-#endif
 }
 
 
Index: b/src/libstdc++-v3/libsupc++/eh_tm.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/eh_tm.cc
+++ b/src/libstdc++-v3/libsupc++/eh_tm.cc
@@ -24,6 +24,7 @@
 
 #include <cstdlib>
 #include "unwind-cxx.h"
+#include "eh_atomics.h"
 
 using namespace __cxxabiv1;
 
@@ -45,9 +46,7 @@ free_any_cxa_exception (_Unwind_Exceptio
       __cxa_free_dependent_exception (dep);
     }
 
-#if __GCC_ATOMIC_INT_LOCK_FREE > 1
-  if (__atomic_sub_fetch (&h->referenceCount, 1, __ATOMIC_ACQ_REL) == 0)
-#endif
+  if (__gnu_cxx::__eh_atomic_dec (&h->referenceCount))
     __cxa_free_exception (h + 1);
 }
 
#Index: b/src/libstdc++-v3/libsupc++/exception
#===================================================================
#--- a/src/libstdc++-v3/libsupc++/exception
#+++ b/src/libstdc++-v3/libsupc++/exception
#@@ -35,7 +35,6 @@
# #pragma GCC visibility push(default)
# 
# #include <bits/c++config.h>
#-#include <bits/atomic_lockfree_defines.h>
# 
# extern "C++" {
# 
#@@ -166,7 +165,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
# 
# #pragma GCC visibility pop
# 
#-#if (__cplusplus >= 201103L) && (ATOMIC_INT_LOCK_FREE > 1)
#+#if (__cplusplus >= 201103L)
# #include <bits/exception_ptr.h>
# #include <bits/nested_exception.h>
# #endif
#Index: b/src/libstdc++-v3/libsupc++/exception_ptr.h
#===================================================================
#--- a/src/libstdc++-v3/libsupc++/exception_ptr.h
#+++ b/src/libstdc++-v3/libsupc++/exception_ptr.h
#@@ -36,10 +36,6 @@
# #include <bits/c++config.h>
# #include <bits/exception_defines.h>
# 
#-#if ATOMIC_INT_LOCK_FREE < 2
#-#  error This platform does not support exception propagation.
#-#endif
#-
# extern "C++" {
# 
# namespace std 
Index: b/src/libstdc++-v3/libsupc++/guard.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/guard.cc
+++ b/src/libstdc++-v3/libsupc++/guard.cc
@@ -30,6 +30,7 @@
 #include <new>
 #include <ext/atomicity.h>
 #include <ext/concurrence.h>
+#include <bits/atomic_lockfree_defines.h>
 #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
   && (ATOMIC_INT_LOCK_FREE > 1) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
 # include <climits>
Index: b/src/libstdc++-v3/libsupc++/nested_exception.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/nested_exception.cc
+++ b/src/libstdc++-v3/libsupc++/nested_exception.cc
@@ -25,7 +25,5 @@
 
 namespace std 
 {
-#if ATOMIC_INT_LOCK_FREE > 1
   nested_exception::~nested_exception() noexcept = default;
-#endif
 } // namespace std
#Index: b/src/libstdc++-v3/libsupc++/nested_exception.h
#===================================================================
#--- a/src/libstdc++-v3/libsupc++/nested_exception.h
#+++ b/src/libstdc++-v3/libsupc++/nested_exception.h
#@@ -39,10 +39,6 @@
# #include <bits/c++config.h>
# #include <bits/move.h>
# 
#-#if ATOMIC_INT_LOCK_FREE < 2
#-#  error This platform does not support exception propagation.
#-#endif
#-
# extern "C++" {
# 
# namespace std
Index: b/src/libstdc++-v3/src/c++11/future.cc
===================================================================
--- a/src/libstdc++-v3/src/c++11/future.cc
+++ b/src/libstdc++-v3/src/c++11/future.cc
@@ -78,8 +78,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   const char*
   future_error::what() const noexcept { return logic_error::what(); }
 
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
-  && (ATOMIC_INT_LOCK_FREE > 1)
+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
   __future_base::_Result_base::_Result_base() = default;
 
   __future_base::_Result_base::~_Result_base() = default;
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/40296.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/40296.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/40296.cc
@@ -1,6 +1,5 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-terminate.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/60612-unexpected.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2015-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/64241.cc
@@ -16,7 +16,6 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-options "-std=gnu++11 -fno-exceptions -O0" }
-// { dg-require-atomic-builtins "" }
 
 #include <exception>
 #include <testsuite_hooks.h>
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/current_exception.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // 2008-05-25  Sebastian Redl  <sebastian.redl@getdesigned.at>
 
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/lifespan.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // 2008-05-25  Sebastian Redl  <sebastian.redl@getdesigned.at>
 
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/move.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/move.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/move.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements_neg.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/requirements_neg.cc
@@ -1,6 +1,5 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
+++ b/src/libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // 2008-05-25  Sebastian Redl  <sebastian.redl@getdesigned.at>
 
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/51438.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/51438.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/51438.cc
@@ -1,6 +1,5 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/62154.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/62154.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/62154.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/cons.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/nested_ptr.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_if_nested.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/rethrow_nested.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
+++ b/src/libstdc++-v3/testsuite/18_support/nested_exception/throw_with_nested.cc
@@ -1,5 +1,4 @@
 // { dg-options "-std=gnu++11" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/42819.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/42819.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/42819.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/49668.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/49668.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/49668.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/54297.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/54297.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/54297.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 // { dg-require-sleep "" }
 
 // Copyright (C) 2012-2016 Free Software Foundation, Inc.
Index: b/src/libstdc++-v3/testsuite/30_threads/async/any.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/any.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/any.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/async.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/async.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/async.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/except.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/except.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/except.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/forced_unwind.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/forced_unwind.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/forced_unwind.cc
@@ -2,7 +2,6 @@
 // { dg-options " -std=gnu++11 -pthread" { target *-*-linux* *-*-gnu* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/launch.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/launch.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/launch.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/lwg2021.cc
@@ -21,7 +21,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // LWG 2021. Further incorrect usages of result_of
 // Arguments to result_of should use decay.
Index: b/src/libstdc++-v3/testsuite/30_threads/async/sync.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/async/sync.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/async/sync.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/assign_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/assign_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/assign_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/constexpr.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/constexpr.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/constexpr.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11 -fno-inline -g0" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 // { dg-final { scan-assembler-not "_ZNSt6futureIvEC2Ev" } }
 // { dg-final { scan-assembler-not "_ZNSt6futureIiEC2Ev" } }
 
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/copy_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/copy_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/copy_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/default.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/default.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/default.cc
@@ -1,7 +1,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/move.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/move.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/move.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/cons/move_assign.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/cons/move_assign.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/cons/move_assign.cc
@@ -1,7 +1,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/45133.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/45133.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/45133.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/get.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/get.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/get.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/share.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/share.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/share.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/valid.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/valid.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/valid.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/wait.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/future/requirements/explicit_instantiation.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/future/requirements/explicit_instantiation.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/future/requirements/explicit_instantiation.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/headers/future/types_std_c++0x.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/headers/future/types_std_c++0x.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/headers/future/types_std_c++0x.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" } 
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/60564.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/56492.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2013-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc_min.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc_min.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc_min.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/assign_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/assign_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/assign_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/copy_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/copy_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/copy_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/forced_unwind.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/forced_unwind.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/forced_unwind.cc
@@ -2,7 +2,6 @@
 // { dg-options " -std=gnu++11 -pthread" { target *-*-linux* *-*-gnu* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/at_thread_exit.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/requirements/explicit_instantiation.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/requirements/explicit_instantiation.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/requirements/explicit_instantiation.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/packaged_task/uses_allocator.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/packaged_task/uses_allocator.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/packaged_task/uses_allocator.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/60966.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/60966.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/60966.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/69106.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/69106.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/69106.cc
@@ -19,7 +19,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 #include <future>
 
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/1.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc2.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc_min.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc_min.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/alloc_min.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/move.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/at_thread_exit.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2014-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/requirements/explicit_instantiation.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/requirements/explicit_instantiation.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/requirements/explicit_instantiation.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/promise/uses_allocator.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/promise/uses_allocator.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/promise/uses_allocator.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2011-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign.cc
@@ -1,7 +1,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/constexpr.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/constexpr.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/constexpr.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11 -fno-inline -g0" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 // { dg-final { scan-assembler-not "_ZNSt13shared_futureIvEC2Ev" } }
 // { dg-final { scan-assembler-not "_ZNSt13shared_futureIiEC2Ev" } }
 
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/copy.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/copy.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/copy.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/default.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/default.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/default.cc
@@ -1,7 +1,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move_assign.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move_assign.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/cons/move_assign.cc
@@ -1,7 +1,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc
@@ -4,7 +4,6 @@
 // { dg-options " -std=gnu++11 " { target *-*-cygwin *-*-rtems* *-*-darwin* } }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //
Index: b/src/libstdc++-v3/testsuite/30_threads/shared_future/requirements/explicit_instantiation.cc
===================================================================
--- a/src/libstdc++-v3/testsuite/30_threads/shared_future/requirements/explicit_instantiation.cc
+++ b/src/libstdc++-v3/testsuite/30_threads/shared_future/requirements/explicit_instantiation.cc
@@ -2,7 +2,6 @@
 // { dg-options "-std=gnu++11" }
 // { dg-require-cstdint "" }
 // { dg-require-gthreads "" }
-// { dg-require-atomic-builtins "" }
 
 // Copyright (C) 2009-2016 Free Software Foundation, Inc.
 //