P4 to Git Change 1469140 by emankov@em-hsa-lightning on 2017/10/12 10:53:13

SWDEV-86035 - Fix OCL build on Linux after LLVM merge (CL 1469082)

	TODO: PAL build should be fixed accordingly

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#71 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#28 edit

rocclr/runtime/device/rocm/rocprogram.cpp

@@ -841,7 +841,7 @@ bool HSAILProgram::setKernels_LC(amd::option::Options* options, void* binary, si
                    !memcmp(name, AMDGPU::ElfNote::NoteName, note->n_namesz)) {
           std::string metadataStr((const char*)desc, (size_t)note->n_descsz);
           metadata_ = new CodeObjectMD();
-          if (CodeObjectMD::fromYamlString(metadataStr, *metadata_)) {
+          if (llvm::AMDGPU::HSAMD::fromString(metadataStr, *metadata_)) {
             buildLog_ += "Error: failed to process metadata\n";
             return false;
           }