From: Jakub Jelinek Date: Wed, 6 Jun 2018 17:55:39 +0000 (+0200) Subject: re PR c++/86068 (__cpp_transactional_memory is 210500) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe16acf26b4b494e92fbccff511f4829f7965da2;p=gcc.git 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 --- diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f90adb75c40..74bf0a49ab0 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2018-06-06 Jakub Jelinek + + 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 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 99a29855b85..bdb5691d78a 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 680cb640b26..de40fb4468c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2018-06-06 Jakub Jelinek + + PR c++/86068 + * include/bits/c++config: Check __cpp_transactional_memory >= 201500L + rather than __cpp_transactional_memory >= 201505L. + 2018-06-06 Jonathan Wakely PR libstdc++/86008 diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 280f65e1ba0..838afc59dfb 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