*.C: Use target c++17 instead of explicit dg-options.

	* g++.dg/*.C: Use target c++17 instead of explicit dg-options.
	* lib/g++-dg.exp: Don't test C++11 by default.  Add C++17 to
	the list of default stds to test.

From-SVN: r265343

gcc/testsuite/ChangeLog

+2018-10-20  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/*.C: Use target c++17 instead of explicit dg-options.
+	* lib/g++-dg.exp: Don't test C++11 by default.  Add C++17 to
+	the list of default stds to test.
+
 2018-10-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/87647

gcc/testsuite/g++.dg/concepts/alias1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/alias2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/alias3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/alias4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/auto1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T1, class T2> class A { };
 

gcc/testsuite/g++.dg/concepts/auto3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class...> class tuple {};
 

gcc/testsuite/g++.dg/concepts/auto4.C

 // PR c++/85006
-// { dg-additional-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
 
 template<typename... Ts> struct A {};
 

gcc/testsuite/g++.dg/concepts/class-deduction1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T>
 concept bool Isint = __is_same_as(T,int);

gcc/testsuite/g++.dg/concepts/class-deduction2.C

 // PR c++/85706
-// { dg-additional-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
 
 template<class T> struct S {
   S(T);

gcc/testsuite/g++.dg/concepts/class.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Class() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/class1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/class2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/class3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/class4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Class() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/class5.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool One() { return sizeof(T) >= 4; }

gcc/testsuite/g++.dg/concepts/class6.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool One() { return sizeof(T) >= 4; }

gcc/testsuite/g++.dg/concepts/constrained-parm.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/debug1.C

 // PR c++/84551
-// { dg-options "-g -O -std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-g -O -fconcepts" }
 
 template<typename> concept bool C() { return true; }
 

gcc/testsuite/g++.dg/concepts/decl-diagnose.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 typedef concept int CINT; // { dg-error "'concept' cannot appear in a typedef declaration" }
 

gcc/testsuite/g++.dg/concepts/deduction-constraint1.C

 // PR c++/67007
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class U>
 concept bool A =

gcc/testsuite/g++.dg/concepts/diagnostic1.C

 // PR c++/67159
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T, class U>
 concept bool SameAs = __is_same_as(T, U);

gcc/testsuite/g++.dg/concepts/disjunction1.C

 // PR c++/66962
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <typename> struct remove_cv;
 template <typename> struct is_reference;

gcc/testsuite/g++.dg/concepts/dr1430.C

 // PR c++/66092
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <type_traits>
 

gcc/testsuite/g++.dg/concepts/equiv.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Check equivalence of short- and longhand declarations.
 

gcc/testsuite/g++.dg/concepts/equiv2.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 
 // template<typename T>

gcc/testsuite/g++.dg/concepts/explicit-inst1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-inst2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-inst3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-inst4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-spec1.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/explicit-spec2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-spec3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/explicit-spec4.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/explicit-spec5.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/explicit-spec6.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 struct A {

gcc/testsuite/g++.dg/concepts/expression.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 #include <iostream>

gcc/testsuite/g++.dg/concepts/expression2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C1()

gcc/testsuite/g++.dg/concepts/expression3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C()

gcc/testsuite/g++.dg/concepts/feature-macro.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #ifndef __cpp_concepts
 #error __cpp_concepts not defined

gcc/testsuite/g++.dg/concepts/fn-concept1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Tuple() { // { dg-error "multiple statements" }

gcc/testsuite/g++.dg/concepts/fn-concept2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept auto C1() { return 0; } // { dg-error "16:concept .concept auto C1\\(\\). declared with a deduced return type" }

gcc/testsuite/g++.dg/concepts/fn1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/fn10.C

-// { dg-do compile }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Test that constraint satisfaction checks work even when
 // processing template declarations.

gcc/testsuite/g++.dg/concepts/fn2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/fn3.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/fn4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/fn5.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Check shorthand notation.
 

gcc/testsuite/g++.dg/concepts/fn6.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Redefinition errors.
 

gcc/testsuite/g++.dg/concepts/fn7.C

-// { dg-do link }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do link { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // FIXME: What is this actually testing?
 

gcc/testsuite/g++.dg/concepts/fn8.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Class() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/fn9.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/friend1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Eq() { return requires(T t) { t == t; }; }

gcc/testsuite/g++.dg/concepts/friend2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Eq() { return requires(T t) { t == t; }; }

gcc/testsuite/g++.dg/concepts/generic-fn-err.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/generic-fn.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 #include <type_traits>

gcc/testsuite/g++.dg/concepts/iconv1.C

 // PR c++/67240
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 int foo(int x)
 {

gcc/testsuite/g++.dg/concepts/inherit-ctor1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/inherit-ctor2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/inherit-ctor3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/inherit-ctor4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C() { return __is_class(T); }

gcc/testsuite/g++.dg/concepts/intro1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool C = __is_class(T);

gcc/testsuite/g++.dg/concepts/intro2.C

-// { dg-do run }
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/intro3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename ... T>
   concept bool C1 = true;

gcc/testsuite/g++.dg/concepts/intro4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename ... T>
   concept bool C1 = true;

gcc/testsuite/g++.dg/concepts/intro5.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T, typename U = int>
   concept bool C()

gcc/testsuite/g++.dg/concepts/intro6.C

 // PR c++/67003
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 namespace X {
   template<class>

gcc/testsuite/g++.dg/concepts/intro7.C

 // PR c++/66985
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <template <class> class T>
 concept bool _Valid = requires { typename T<int>; };

gcc/testsuite/g++.dg/concepts/locations1.C

-// { dg-additional-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
 
 struct S
 {

gcc/testsuite/g++.dg/concepts/member-concept.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 struct Base {
   template<typename T>

gcc/testsuite/g++.dg/concepts/memfun-err.C

-// { dg-do run}
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 
 template<typename T>

gcc/testsuite/g++.dg/concepts/memfun.C

-// { dg-do run}
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do run { target c++17 } }
+// { dg-options "-fconcepts" }
 
 #include <cassert>
 

gcc/testsuite/g++.dg/concepts/memfun2.C

 // PR c++/72415
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<int... Indices>
 struct indices {};

gcc/testsuite/g++.dg/concepts/memtmpl1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T>
 struct A {

gcc/testsuite/g++.dg/concepts/partial-concept-id1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
   concept bool Type() { return true; }

gcc/testsuite/g++.dg/concepts/partial-concept-id2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Make sure that we check partial concept ids
 // with variable concepts.

gcc/testsuite/g++.dg/concepts/partial-spec.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Check that constraints don't break unconstrained partial
 // specializations.

gcc/testsuite/g++.dg/concepts/partial-spec2.C

 // PR c++/67084
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T>
 constexpr bool p = false;

gcc/testsuite/g++.dg/concepts/partial-spec3.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T> struct A { };
 template <class T> requires false struct A<T*> { };

gcc/testsuite/g++.dg/concepts/partial-spec4.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T> concept bool is_int = __is_same_as(T,int);
 

gcc/testsuite/g++.dg/concepts/partial-spec5.C

 // PR c++/67138
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T>
 concept bool _Auto = true;

gcc/testsuite/g++.dg/concepts/partial-spec6.C

 // PR c++/67152
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T>
 concept bool HasType = requires { typename T::type; };

gcc/testsuite/g++.dg/concepts/placeholder1.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T, typename U>
 struct is_same

gcc/testsuite/g++.dg/concepts/placeholder2.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Check argument deduction constraints.
 // TODO: We shoul have more of these...

gcc/testsuite/g++.dg/concepts/placeholder3.C

 // PR c++/66218
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T, class U>
 concept bool Same = __is_same_as(T, U);

gcc/testsuite/g++.dg/concepts/placeholder4.C

 // PR c++/66218
-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T, class U>
 concept bool Same = __is_same_as(T, U);

gcc/testsuite/g++.dg/concepts/placeholder5.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class T, class U>
 concept bool Same = __is_same_as(T, U);

gcc/testsuite/g++.dg/concepts/placeholder6.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <int I> struct B { static const int i = I; };
 template <int I> concept bool Few = I < 10;

gcc/testsuite/g++.dg/concepts/pr65552.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool Concept() {

gcc/testsuite/g++.dg/concepts/pr65575.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C = false;

gcc/testsuite/g++.dg/concepts/pr65634.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C1() {

gcc/testsuite/g++.dg/concepts/pr65636.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 using TD = int;
 

gcc/testsuite/g++.dg/concepts/pr65681.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C()

gcc/testsuite/g++.dg/concepts/pr65848.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Performance test... This should be fast.
 

gcc/testsuite/g++.dg/concepts/pr65854.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 // Handle alias templates in type requirements.
 

gcc/testsuite/g++.dg/concepts/pr66091.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C1()

gcc/testsuite/g++.dg/concepts/pr67249.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template<class T> concept bool C1 = true;
 template<class A, class B> struct Pair {};

gcc/testsuite/g++.dg/concepts/pr67595.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class X> concept bool allocatable = requires{{new X}->X * };
 template <class X> concept bool semiregular = allocatable<X>;

gcc/testsuite/g++.dg/concepts/pr68434.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <class>
 concept bool C1 () {

gcc/testsuite/g++.dg/concepts/pr68683.C

-// { dg-options "-std=c++17 -fconcepts" }
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
 
 template <typename, typename>
 struct is_same {