coroutines: Rename the coroutines cpp builtin.

The current standard draft (n4861) amends the cpp builtin for
coroutines to '__cpp_impl_coroutine', no other change.

gcc/c-family/ChangeLog:

2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>

	* c-cppbuiltin.c (c_cpp_builtins): Update coroutines builtin
	define, per n4861.

gcc/testsuite/ChangeLog:

2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>

	* g++.dg/coroutines/coro-pre-proc.C: Update coroutines builtin
	define, per n4861.
	* g++.dg/coroutines/coro.h: Likewise.

libstdc++-v3/ChangeLog:

2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>

	* include/std/coroutine: Update coroutines builtin define,
	per n4861.

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 92aed0ed7ce1c3b2055dad097437aef90c1571ec..414d0c09be94f9e26c858d32e688fbda7b4a0f71 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * c-cppbuiltin.c (c_cpp_builtins): Update coroutines builtin
+       define, per n4861.
+
 2020-04-02  Richard Biener  <rguenther@suse.de>
 
        PR c/94392

diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 5532ae46ae146931d416687a1ead79e8990110b1..db91a36794a05a294c35b03b3a95fff67eea8926 100644 (file)
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -1012,7 +1012,7 @@ c_cpp_builtins (cpp_reader *pfile)
             cpp_define (pfile, "__cpp_concepts=201507L");
         }
       if (flag_coroutines)
-       cpp_define (pfile, "__cpp_coroutines=201902L"); /* n4835, C++20 CD */
+       cpp_define (pfile, "__cpp_impl_coroutine=201902L"); /* n4861, DIS */
       if (flag_tm)
        /* Use a value smaller than the 201505 specified in
           the TS, since we don't yet support atomic_cancel.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 805aa398252cce7c6d6d57d84757ba99f155d448..e0d3ea91d57ca880199a3015ea47d0685ade3a04 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * g++.dg/coroutines/coro-pre-proc.C: Update coroutines builtin
+       define, per n4861.
+       * g++.dg/coroutines/coro.h: Likewise.
+
 2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>
 
        * gcc.dg/darwin-version-1.c: Use -mmacosx-version-min= 10.8

diff --git a/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C b/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C
index f22a5e08332d05f7c77ab79ec570dad1e5451614..eacdb35d3c70542095f3733632318d7dcc8ea5fd 100644 (file)
--- a/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C
+++ b/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C
@@ -1,9 +1,9 @@
 // Only need to compile this, with the default options from the .exp.
 
-#ifndef __cpp_coroutines
+#ifndef __cpp_impl_coroutine
 #error "coroutines should engaged."
 #endif
 
-#if __cpp_coroutines != 201902L
+#if __cpp_impl_coroutine != 201902L
 #error "coroutine version out of sync."
 #endif

diff --git a/gcc/testsuite/g++.dg/coroutines/coro.h b/gcc/testsuite/g++.dg/coroutines/coro.h
index 31336549f82be5112919f311c1695b5f4eae489f..a1bd38b8d1259534dbbd93e5485951ea31d635ed 100644 (file)
--- a/gcc/testsuite/g++.dg/coroutines/coro.h
+++ b/gcc/testsuite/g++.dg/coroutines/coro.h
@@ -29,7 +29,7 @@ namespace coro = std::experimental;
 // Fragments (with short-cuts) to mimic enough of the library header to
 // make some progress.
 
-#  if __cpp_coroutines
+#  if __cpp_impl_coroutine
 
 namespace std {
 inline namespace __n4835 {

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3ca7a0e7165fc233f1e62ffb7f5d4d6a11797a20..5d4c34ada1807bac667e4ccd8a444ca8f6ebb5ee 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * include/std/coroutine: Update coroutines builtin define,
+       per n4861.
+
 2020-04-09  Jonathan Wakely  <jwakely@redhat.com>
 
        * libsupc++/compare (compare_three_way): Fix noexcept-specifier.

diff --git a/libstdc++-v3/include/std/coroutine b/libstdc++-v3/include/std/coroutine
index 363402330e45d62823137d413e181d8cdb346fb7..2e45c4514504fd11b85300072004cce831f8efdd 100644 (file)
--- a/libstdc++-v3/include/std/coroutine
+++ b/libstdc++-v3/include/std/coroutine
@@ -54,7 +54,7 @@ namespace std _GLIBCXX_VISIBILITY (default)
 {
   _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
-#if __cpp_coroutines
+#if __cpp_impl_coroutine
   inline namespace __n4835 {
 
   // 17.12.2 coroutine traits