From a21443783676972c525dcfe27af02e714efb316e Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 31 Oct 2016 14:30:53 -0400 Subject: [PATCH] P4 to Git Change 1334142 by gandryey@gera-ocl-lc on 2016/10/31 14:17:14 SWDEV-86035 - Add PAL backend to OpenCL - Fix 2 warnings with LC path Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#9 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#19 edit --- rocclr/runtime/device/pal/palcompiler.cpp | 2 +- rocclr/runtime/device/pal/palprogram.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/pal/palcompiler.cpp b/rocclr/runtime/device/pal/palcompiler.cpp index 51b8d8a500..460e7ee80e 100644 --- a/rocclr/runtime/device/pal/palcompiler.cpp +++ b/rocclr/runtime/device/pal/palcompiler.cpp @@ -211,7 +211,7 @@ LightningProgram::newCompilerInstance() pthread_once(&once, checkLLVM_BIN); #endif // defined(ATI_OS_LINUX) #if defined(DEBUG) - std::string clangExe(llvmBin_ + "/clang"); + std::string clangExe(llvmBin_ + LINUX_SWITCH("/clang", "\\clang.exe")); struct stat buf; if (stat(clangExe.c_str(), &buf)) { std::string msg("Could not find the Clang binary in " + llvmBin_); diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index c146c8e139..dccee6d56d 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/rocclr/runtime/device/pal/palprogram.cpp @@ -1338,7 +1338,8 @@ LightningProgram::setKernels( return false; } - setGlobalVariableTotalSize(progvarsTotalSize); + // note: The global variable size is updated in the context loader + //setGlobalVariableTotalSize(progvarsTotalSize); // Get the list of kernels std::vector kernelNameList;