From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 6 Dec 2019 21:18:10 +0000 (+0100)
Subject: c-cppbuiltin.c (c_cpp_builtins): Don't define __cpp_consteval for now.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=abd6d8cc4f34e5a4df8c2a16ef19ebb08daed6f8;p=gcc.git

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 bcbb999dcbf..8e74736988e 100644
--- 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 5ad626d7f24..03d3dd78657 100644
--- 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 fba5f81b50b..d92686c859f 100644
--- 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 c86aead79af..dd15cd6af3c 100644
--- 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"