P4 to Git Change 1398063 by lmoriche@lmoriche_opencl_dev2 on 2017/04/13 12:12:33

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Make it possible to build with libstdc++

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/memfile.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#126 edit
... //depot/stg/opencl/drivers/opencl/runtime/thread/semaphore.cpp#9 edit


[ROCm/clr commit: a615e4fbb6]

projects/clr/rocclr/runtime/platform/memory.cpp

@@ -87,12 +87,12 @@ Memory::Memory(
         , isParent_(false)
         , vDev_(NULL)
         , forceSysMemAlloc_(false)
+        , mapCount_(0)
         , svmHostAddress_(svmPtr)
         , svmPtrCommited_(false)
         , canBeCached_(true)
         , lockMemoryOps_("Memory Ops Lock", true)
 {
-    std::atomic_init(&mapCount_, 0u);
 }
 
 Memory::Memory(
@@ -117,6 +117,7 @@ Memory::Memory(
         , isParent_(false)
         , vDev_(NULL)
         , forceSysMemAlloc_(false)
+        , mapCount_(0)
         , svmHostAddress_(parent.getSvmPtr())
         , svmPtrCommited_(parent.isSvmPtrCommited())
         , canBeCached_(true)
@@ -144,8 +145,6 @@ Memory::Memory(
             (CL_MEM_HOST_READ_ONLY | CL_MEM_HOST_WRITE_ONLY |
              CL_MEM_HOST_NO_ACCESS);
     }
-
-    std::atomic_init(&mapCount_, 0u);
 }
 
 void
@@ -1284,11 +1283,11 @@ static int
 round_to_even(float v)
 {
     // clamp overflow
-    if (v >= -(float)INT_MIN) {
-        return INT_MAX;
+    if (v >= -(float)std::numeric_limits<int>::min()) {
+        return std::numeric_limits<int>::max();
     }
-    if (v <= (float)INT_MIN) {
-        return INT_MIN;
+    if (v <= (float)std::numeric_limits<int>::min()) {
+        return std::numeric_limits<int>::min();
     }
     static const unsigned int magic[2] = { 0x4b000000u, 0xcb000000u };