commit 3c6ae9c30e86263cf764cef946b8783810583079
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Sep 5 10:31:05 2017 +0100

    Remove owner_less<void> test that fails on gcc-6-branch
    
            * testsuite/20_util/owner_less/noexcept.cc: Remove owner_less<void>
            tests.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8a87b7b155a..d88a08f2452 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-05  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/20_util/owner_less/noexcept.cc: Remove owner_less<void>
+	tests.
+
 2017-09-04  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline
diff --git a/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc b/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
index 25c9afde8e1..fcf5d4f2679 100644
--- a/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
+++ b/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
@@ -29,12 +29,3 @@ const std::owner_less<std::weak_ptr<int>> owi;
 static_assert( noexcept(owi(wi, wi)), "" );
 static_assert( noexcept(owi(si, wi)), "" );
 static_assert( noexcept(owi(wi, si)), "" );
-const std::shared_ptr<long> sl;
-const std::weak_ptr<char> wc;
-const std::owner_less<void> ov;
-static_assert( noexcept(ov(si, si)), "" );
-static_assert( noexcept(ov(si, sl)), "" );
-static_assert( noexcept(ov(sl, si)), "" );
-static_assert( noexcept(ov(si, wc)), "" );
-static_assert( noexcept(ov(wc, si)), "" );
-static_assert( noexcept(ov(wc, wi)), "" );