summaryrefslogtreecommitdiffstats
path: root/config.tests/atomicfptr/icc2016_mac.diff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-31 12:51:38 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:38:00 +0000
commitb0060d1056d6d1752d91652261de97db909c7862 (patch)
tree6f4a13108e51d349617e708a16ea13b00e9546e0 /config.tests/atomicfptr/icc2016_mac.diff
parentf54f7d847099db448223fd630c5416b6fbd84c9e (diff)
configure: un-namespace remaining non-inline configure tests
only few tests remain, and many of these were mis-classified anyway. Change-Id: Ic3bc96928a0c79fe77b9ec10e6508d4822f18df2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests/atomicfptr/icc2016_mac.diff')
-rw-r--r--config.tests/atomicfptr/icc2016_mac.diff18
1 files changed, 18 insertions, 0 deletions
diff --git a/config.tests/atomicfptr/icc2016_mac.diff b/config.tests/atomicfptr/icc2016_mac.diff
new file mode 100644
index 0000000000..5de3b6e19a
--- /dev/null
+++ b/config.tests/atomicfptr/icc2016_mac.diff
@@ -0,0 +1,18 @@
+Patch for fixing std::atomic support for function pointers for the Intel
+Composer XE 2016 (compiler version 16.0).
+
+To apply:
+ cd /opt/intel/compilers_and_libraries_2016/mac/include
+ sudo patch -p1 < /path-to-this-file/icc2016_mac.diff
+
+--- include/stdatomic.h.orig 2015-08-28 15:05:13.000000000 -0700
++++ include/stdatomic.h 2015-08-28 15:19:25.000000000 -0700
+@@ -451,7 +451,7 @@
+ }
+ _STRONG_INLINE atomic() _DEFAULTED
+ _STRONG_INLINE _CONSTEXPR atomic(T* _Ptr)
+- : atomic_address(_Ptr)
++ : atomic_address((void*)_Ptr)
+ {
+ }
+ _STRONG_INLINE T* operator+=(ptrdiff_t _V) volatile