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 f90adb75c4075d2b67dc0b7552bf17649edcefcc..74bf0a49ab0cb1e2d3448c0db01f7e4c9e3e36d5 100644 (file)
--- 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 99a29855b85646594dafdbb61e781429457ad62c..bdb5691d78a9bac7dae4186c085e9d3684e43b48 100644 (file)
--- 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 680cb640b2612db9d9f9e78f5f3f69e22f814ca9..de40fb4468c7f6e919c20ba2fb93da1376a322db 100644 (file)
--- 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 280f65e1ba0a4d1f1f8d462f499c47969a52ce53..838afc59dfb1889834bf5d97725ad77f0e42b9a6 100644 (file)
--- 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