P4 to Git Change 1402826 by lmoriche@lmoriche_opencl_dev2 on 2017/04/26 12:05:30

SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime
	- Cleanups to build with gcc 5.4 and cmake.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.hpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/blit.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprintf.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#36 edit

rocclr/runtime/device/rocm/rocprogram.cpp

@@ -7,13 +7,13 @@
 
 #include "rocprogram.hpp"
 
-#include "compiler/lib/utils/options.hpp"
+#include "utils/options.hpp"
 #include "rockernel.hpp"
 #if defined(WITH_LIGHTNING_COMPILER)
 #include "AMDGPUPTNote.h"
-#include "libelf/gelf.h"
 #include "driver/AmdCompiler.h"
 #include "libraries.amdgcn.inc"
+#include <gelf.h>
 #else  // !defined(WITH_LIGHTNING_COMPILER)
 #include "roccompilerlib.hpp"
 #include "amd_hsa_code.hpp"