19 files changed, 5 insertions, 3 deletions
diff --git a/libcxx/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp b/libcxx/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
index cc99b83aca4..cc99b83aca4 100644
--- a/libcxx/test/std/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
+++ b/libcxx/test/libcxx/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/types.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp
index f7c9b223add..cb0fb803c6a 100644
--- a/libcxx/test/std/thread/futures/futures.tas/types.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp
@@ -16,7 +16,9 @@
 //     class packaged_task<R(ArgTypes...)>
 // {
 // public:
-//     typedef R result_type;
+//     typedef R result_type; // extension
+
+// This is a libc++ extension.
 
 #include <future>
 #include <type_traits>
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp
index 9449e149027..9449e149027 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
index 3f11d670bed..3f11d670bed 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_move.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp
index 5d53119b317..6d7d734bd5e 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor1.fail.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp
@@ -15,7 +15,7 @@
 // class packaged_task<R(ArgTypes...)>
 // template <class F>
 //   packaged_task(F&& f);
-// These constructors shall not participate in overload resolution if 
+// These constructors shall not participate in overload resolution if
 //    decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>.
 
 #include <future>
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp
index bedff389b05..984dcdc80b3 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor2.fail.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp
@@ -15,7 +15,7 @@
 // class packaged_task<R(ArgTypes...)>
 // template <class F, class Allocator>
 //   packaged_task(allocator_arg_t, const Allocator& a, F&& f);
-// These constructors shall not participate in overload resolution if 
+// These constructors shall not participate in overload resolution if
 //    decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>.
 
 #include <future>
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp
index ff07db9a2e6..ff07db9a2e6 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp
index ed147d74895..ed147d74895 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_default.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
index 14ac7614bb8..14ac7614bb8 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
index 39784876b8c..39784876b8c 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
index d9951dca585..d9951dca585 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_move.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
index 7fafd100564..7fafd100564 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/dtor.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
index c8e5d6efd6b..c8e5d6efd6b 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/get_future.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
index 54ac6445824..54ac6445824 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/make_ready_at_thread_exit.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
index 9ad1509517f..9ad1509517f 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/operator.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
index 02a567500ee..02a567500ee 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/reset.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
index eb0091c8e81..eb0091c8e81 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/swap.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
index d90d593a75b..d90d593a75b 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/swap.pass.cpp
diff --git a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
index bbe75de7f8a..bbe75de7f8a 100644
--- a/libcxx/test/std/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp