diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-06-06 19:55:39 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-06-06 19:55:39 +0200 |
| commit | fe16acf26b4b494e92fbccff511f4829f7965da2 (patch) | |
| tree | 99f2c5fc4ab1b9b1b458c9be3dd2199921ca363e | |
| parent | e58c9d921da423712db8369e8bb69d4ae992e94d (diff) | |
| download | gcc-fe16acf26b4b494e92fbccff511f4829f7965da2.zip gcc-fe16acf26b4b494e92fbccff511f4829f7965da2.tar.gz gcc-fe16acf26b4b494e92fbccff511f4829f7965da2.tar.bz2 | |
re PR c++/86068 (__cpp_transactional_memory is 210500)
PR c++/86068
* c-cppbuiltin.c (c_cpp_builtins): Fix a typo, set
__cpp_transactional_memory to 201500 instead of 210500.
* include/bits/c++config: Check __cpp_transactional_memory >= 201500L
rather than __cpp_transactional_memory >= 201505L.
From-SVN: r261242
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 2 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f90adb7..74bf0a4 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2018-06-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/86068 + * c-cppbuiltin.c (c_cpp_builtins): Fix a typo, set + __cpp_transactional_memory to 201500 instead of 210500. + 2018-06-06 Jason Merrill <jason@redhat.com> PR c++/85710 - ICE with -Wmemset-elt-size. diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 99a2985..bdb5691 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -981,7 +981,7 @@ c_cpp_builtins (cpp_reader *pfile) if (flag_tm) /* Use a value smaller than the 201505 specified in the TS, since we don't yet support atomic_cancel. */ - cpp_define (pfile, "__cpp_transactional_memory=210500"); + cpp_define (pfile, "__cpp_transactional_memory=201500"); if (flag_sized_deallocation) cpp_define (pfile, "__cpp_sized_deallocation=201309"); if (aligned_new_threshold) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 680cb64..de40fb4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2018-06-06 Jakub Jelinek <jakub@redhat.com> + + PR c++/86068 + * include/bits/c++config: Check __cpp_transactional_memory >= 201500L + rather than __cpp_transactional_memory >= 201505L. + 2018-06-06 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/86008 diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 280f65e..838afc5 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -535,7 +535,7 @@ namespace std // Most of the following conditions are due to limitations in the current // implementation. #if __cplusplus >= 201103L && _GLIBCXX_USE_CXX11_ABI \ - && _GLIBCXX_USE_DUAL_ABI && __cpp_transactional_memory >= 201505L \ + && _GLIBCXX_USE_DUAL_ABI && __cpp_transactional_memory >= 201500L \ && !_GLIBCXX_FULLY_DYNAMIC_STRING && _GLIBCXX_USE_WEAK_REF \ && _GLIBCXX_USE_ALLOCATOR_NEW #define _GLIBCXX_TXN_SAFE transaction_safe |