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

gcc/c-family/ChangeLog

+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.

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)

libstdc++-v3/ChangeLog

+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

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