c-cppbuiltin.c (c_cpp_builtins): Don't define __cpp_consteval for now.

	* c-cppbuiltin.c (c_cpp_builtins): Don't define __cpp_consteval for
	now.

	* g++.dg/cpp2a/feat-cxx2a.C: Don't test __cpp_consteval for now.

From-SVN: r279065

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index bcbb999dcbf83a99bdcdd05c424ea894810977d0..8e74736988e9efa05d50f8715396ec771f64f5ce 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * c-cppbuiltin.c (c_cpp_builtins): Don't define __cpp_consteval for
+       now.
+
 2019-12-05  Marek Polacek  <polacek@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 5ad626d7f2466362d02ce09969fad0fdb6463687..03d3dd78657e4c51b8a05f34a9b552d65fcac07d 100644 (file)
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -1001,7 +1001,7 @@ c_cpp_builtins (cpp_reader *pfile)
          cpp_define (pfile, "__cpp_constexpr=201907L");
          cpp_define (pfile, "__cpp_constexpr_in_decltype=201711L");
          cpp_define (pfile, "__cpp_conditional_explicit=201806L");
-         cpp_define (pfile, "__cpp_consteval=201811L");
+         /* cpp_define (pfile, "__cpp_consteval=201811L"); */
          cpp_define (pfile, "__cpp_constinit=201907L");
          cpp_define (pfile, "__cpp_deduction_guides=201907L");
          cpp_define (pfile, "__cpp_nontype_template_parameter_class=201806L");

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fba5f81b50beb8b287226b3b714862591463c541..d92686c859fcf4e834ce9874b8c2fb876c6bbde5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2019-12-06  Jakub Jelinek  <jakub@redhat.com>
 
+       * g++.dg/cpp2a/feat-cxx2a.C: Don't test __cpp_consteval for now.
+
        PR c++/92831 - CWG 1299, not extending temporary lifetime for ?:
        * g++.dg/cpp0x/temp-extend2.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
index c86aead79af8aa723e5e45fdd894cee6c7d0b2d6..dd15cd6af3cb9c6a7b8308cd41771fcfc5d35168 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
+++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
@@ -526,11 +526,13 @@
 #  error "__cpp_constexpr_in_decltype != 201711"
 #endif
 
+/* Not supported fully yet:
 #ifndef __cpp_consteval
 #  error "__cpp_consteval"
 #elif __cpp_consteval != 201811
 #  error "__cpp_consteval != 201811"
 #endif
+*/
 
 #ifndef __cpp_concepts
 #  error "__cpp_concepts"