Fix tests that fail when built with different options

	* testsuite/20_util/duration/cons/2.cc: Add -ffloat-store to fix
	failure when compiled without optimisation.
	* testsuite/ext/profile/mutex_extensions_neg.cc: Prune additional
	errors caused by C++17 std::pmr alias templates.

From-SVN: r265287

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b26e1fcfd299e5195ae729abeddd9c5e9eb26afb..5edbec9d36c78f14a8713d911a12d48a6604d595 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2018-10-18  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/20_util/duration/cons/2.cc: Add -ffloat-store to fix
+       failure when compiled without optimisation.
+       * testsuite/ext/profile/mutex_extensions_neg.cc: Prune additional
+       errors caused by C++17 std::pmr alias templates.
+
        PR libstdc++/87642
        * config/locale/gnu/monetary_members.cc
        (moneypunct<char, true>::_M_initialize_moneypunct): Use

diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
index 3f48f25f101e4fd78f64bae22ea2ae3bac16de45..65b151f8b20cd525072f1c975e6a24f40a4ddec7 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc
@@ -1,4 +1,5 @@
 // { dg-do run { target c++11 } }
+// { dg-additional-options "-ffloat-store" { target { m68*-*-* || ia32 } } }
 
 // Copyright (C) 2008-2018 Free Software Foundation, Inc.
 //

diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
index 147d56740a15d50e313b2f68d1830ccc92394fd1..69cc1115b80a5b0c3f1bd3372f0ba1b2320f3d85 100644 (file)
--- a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
+++ b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
@@ -29,3 +29,5 @@
 
 // "template argument 1 is invalid"
 // { dg-prune-output "tuple:993" }
+// PMR alias templates cause ambiguities between debug and profile containers:
+// { dg-prune-output "is ambiguous" }