diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2020-04-13 20:48:46 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2020-04-13 20:52:03 +0100 |
| commit | ee26baf4a8162a309fbcba591377b9e0c362630d (patch) | |
| tree | 22edcace996d4f2eff66a4bb84b7fabaf3fa81d8 | |
| parent | 2dd4ceacd8ba3718573c67cd43f8a403fcf4146d (diff) | |
| download | gcc-ee26baf4a8162a309fbcba591377b9e0c362630d.zip gcc-ee26baf4a8162a309fbcba591377b9e0c362630d.tar.gz gcc-ee26baf4a8162a309fbcba591377b9e0c362630d.tar.bz2 | |
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.
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/coroutines/coro.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/coroutine | 2 |
7 files changed, 21 insertions, 5 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 92aed0e..414d0c0 100644 --- 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 5532ae4..db91a36 100644 --- 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 805aa39..e0d3ea9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 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 for system versions 10.14 and 10.15. diff --git a/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C b/gcc/testsuite/g++.dg/coroutines/coro-pre-proc.C index f22a5e0..eacdb35 100644 --- 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 3133654..a1bd38b 100644 --- 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 3ca7a0e..5d4c34ad 100644 --- 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 3634023..2e45c45 100644 --- 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 |