r298256 - [OpenCL] Fix extension guards for atomic functions

[Anastasia Stulova via cfe-commits]

Author: stulova
Date: Mon Mar 20 10:02:54 2017
New Revision: 298256

URL: http://llvm.org/viewvc/llvm-project?rev=298256&view=rev
Log:
[OpenCL] Fix extension guards for atomic functions

Review: D30830

Patch by James Price!


Modified:
    cfe/trunk/lib/Headers/opencl-c.h

Modified: cfe/trunk/lib/Headers/opencl-c.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=298256&r1=298255&r2=298256&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/opencl-c.h (original)
+++ cfe/trunk/lib/Headers/opencl-c.h Mon Mar 20 10:02:54 2017
@@ -13703,10 +13703,10 @@ float __ovld atomic_xchg(volatile __loca
 
 #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 __
 #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