summaryrefslogtreecommitdiffstats
path: root/lib/Headers
diff options
context:
space:
mode:
authorAnastasia Stulova <anastasia.stulova@arm.com>2017-03-20 15:02:54 +0000
committerAnastasia Stulova <anastasia.stulova@arm.com>2017-03-20 15:02:54 +0000
commit5ab5499a5cc2de2ef4fd813a66438d44ee88e425 (patch)
tree5d8deeebbe9afb72b45173e5596fbc2b470c1b5c /lib/Headers
parente88f773dad2238b87c5b425eab780d02fdc62c9a (diff)
[OpenCL] Fix extension guards for atomic functions
Review: D30830 Patch by James Price! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@298256 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Headers')
-rw-r--r--lib/Headers/opencl-c.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Headers/opencl-c.h b/lib/Headers/opencl-c.h
index f6ae50c9f0..6452d5c987 100644
--- a/lib/Headers/opencl-c.h
+++ b/lib/Headers/opencl-c.h
@@ -13703,10 +13703,10 @@ float __ovld atomic_xchg(volatile __local float *p, float val);
#if defined(cl_khr_global_int32_base_atomics)
int __ovld atom_xchg(volatile __global int *p, int val);
-int __ovld atom_xchg(volatile __local int *p, int val);
+unsigned int __ovld atom_xchg(volatile __global unsigned int *p, unsigned int val);
#endif
#if defined(cl_khr_local_int32_base_atomics)
-unsigned int __ovld atom_xchg(volatile __global unsigned int *p, unsigned int val);
+int __ovld atom_xchg(volatile __local int *p, int val);
unsigned int __ovld atom_xchg(volatile __local unsigned int *p, unsigned int val);
#endif
@@ -13823,8 +13823,6 @@ unsigned int __ovld atom_min(volatile __local unsigned int *p, unsigned int val)
#if defined(cl_khr_int64_extended_atomics)
long __ovld atom_min(volatile __global long *p, long val);
unsigned long __ovld atom_min(volatile __global unsigned long *p, unsigned long val);
-#endif
-#if defined(cl_khr_local_int32_extended_atomics)
long __ovld atom_min(volatile __local long *p, long val);
unsigned long __ovld atom_min(volatile __local unsigned long *p, unsigned long val);
#endif