From 8483576cc77c1122086cb032b9ade981bf3304ae Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 13 Dec 2019 18:41:05 -0500 Subject: [PATCH] P4 to Git Change 2045916 by gandryey@gera-win10 on 2019/12/13 18:32:11 SWDEV-197836 - Drop the use of llvm header files in opencl runtime - Fix compilation error with configurations where COMGR is disabled. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#76 edit --- rocclr/runtime/device/devprogram.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp index 0cc7330a3a..7a04966cff 100644 --- a/rocclr/runtime/device/devprogram.cpp +++ b/rocclr/runtime/device/devprogram.cpp @@ -619,10 +619,12 @@ bool Program::compileAndLinkExecutable(const amd_comgr_data_set_t inputs, return (status == AMD_COMGR_STATUS_SUCCESS); } +#endif // defined(USE_COMGR_LIBRARY) bool Program::compileImplLC(const std::string& sourceCode, const std::vector& headers, const char** headerIncludeNames, amd::option::Options* options) { +#if defined(USE_COMGR_LIBRARY) const char* xLang = options->oVariables->XLang; if (xLang != nullptr) { if (strcmp(xLang,"asm") == 0) { @@ -749,8 +751,11 @@ bool Program::compileImplLC(const std::string& sourceCode, amd::Comgr::destroy_data_set(inputs); return ret; +#else // defined(USE_COMGR_LIBRARY) + return false; +#endif // defined(USE_COMGR_LIBRARY) } -#endif // defined(USE_COMGR_LIBRARY) + // ================================================================================================ static void logFunction(const char* msg, size_t size) {