git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jakub Jelinek 2018-06-06 19:55:39 +02:00 committed by Jakub Jelinek
parent e58c9d921d
commit fe16acf26b
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/c-family/ChangeLog
View File

@ -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> 2018-06-06 Jason Merrill <jason@redhat.com>
PR c++/85710 - ICE with -Wmemset-elt-size. PR c++/85710 - ICE with -Wmemset-elt-size.

2
gcc/c-family/c-cppbuiltin.c
View File

@ -981,7 +981,7 @@ c_cpp_builtins (cpp_reader *pfile)
if (flag_tm) if (flag_tm)
/* Use a value smaller than the 201505 specified in /* Use a value smaller than the 201505 specified in
the TS, since we don't yet support atomic_cancel. */ 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) if (flag_sized_deallocation)
cpp_define (pfile, "__cpp_sized_deallocation=201309"); cpp_define (pfile, "__cpp_sized_deallocation=201309");
if (aligned_new_threshold) if (aligned_new_threshold)

6
libstdc++-v3/ChangeLog
View File

@ -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> 2018-06-06 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/86008 PR libstdc++/86008

2
libstdc++-v3/include/bits/c++config
View File

@ -535,7 +535,7 @@ namespace std
// Most of the following conditions are due to limitations in the current // Most of the following conditions are due to limitations in the current
// implementation. // implementation.
#if __cplusplus >= 201103L && _GLIBCXX_USE_CXX11_ABI \ #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_FULLY_DYNAMIC_STRING && _GLIBCXX_USE_WEAK_REF \
&& _GLIBCXX_USE_ALLOCATOR_NEW && _GLIBCXX_USE_ALLOCATOR_NEW
#define _GLIBCXX_TXN_SAFE transaction_safe #define _GLIBCXX_TXN_SAFE transaction_safe