commit 1d810d9fd1fbe11a144907a74686d0a03945a1a1
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Nov 20 21:31:27 2017 +0000

    Fix failing tests caused by duplicate dg-options
    
            * testsuite/special_functions/18_riemann_zeta/check_value.cc: Fix
            duplicate dg-options directive.
            * testsuite/tr1/5_numerical_facilities/special_functions/
            20_riemann_zeta/check_value_neg.cc: Likewise.

diff --git a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
index 8733531f8b2..48088653d16 100644
--- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
+++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc
@@ -21,7 +21,7 @@
 //  riemann_zeta
 
 // This can take long on simulators, timing out the test.
-// { dg-options "-DMAX_ITERATIONS=5" { target simulator } }
+// { dg-additional-options "-DMAX_ITERATIONS=5" { target simulator } }
 
 #ifndef MAX_ITERATIONS
 #define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>))
@@ -111,15 +111,6 @@ data001[55] =
   { -4.4375384158955686, 0.80000000000000071, 0.0 },
 };
 const double toler001 = 2.5000000000000020e-13;
-//  riemann_zeta
-
-// This can take long on simulators, timing out the test.
-// { dg-options "-DMAX_ITERATIONS=5" { target simulator } }
-
-#ifndef MAX_ITERATIONS
-#define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>))
-#endif
-
 
 // Test data.
 // max(|f - f_Boost|): 8.8817841970012523e-16 at index 1
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc
index c8035a9c012..a693d394624 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc
@@ -21,7 +21,7 @@
 //  riemann_zeta
 
 // This can take long on simulators, timing out the test.
-// { dg-options "-DMAX_ITERATIONS=5" { target simulator } }
+// { dg-additional-options "-DMAX_ITERATIONS=5" { target simulator } }
 
 #ifndef MAX_ITERATIONS
 #define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>))
@@ -111,15 +111,6 @@ data001[55] =
   { -4.4375384158955686, 0.80000000000000071, 0.0 },
 };
 const double toler001 = 2.5000000000000020e-13;
-//  riemann_zeta
-
-// This can take long on simulators, timing out the test.
-// { dg-options "-DMAX_ITERATIONS=5" { target simulator } }
-
-#ifndef MAX_ITERATIONS
-#define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>))
-#endif
-
 
 // Test data.
 // max(|f - f_Boost|): 8.8817841970012523e-16 at index 1