P4 to Git Change 1330411 by lmoriche@lmoriche_opencl_lc on 2016/10/24 01:16:07

SWDEV-105604 - [OCL-LC-PAL] OpenCL program manager for LC on PAL
	- Add Windows support

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.def.in#16 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/common/win32/compat.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#38 edit
... //depot/stg/opencl/drivers/opencl/make/clang.git/include/build/Makefile.include#4 edit
... //depot/stg/opencl/drivers/opencl/make/llvm.git/win32/include/llvm/Config/config.h#2 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#190 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/top.hpp#24 edit

rocclr/runtime/device/pal/palprogram.cpp

@@ -14,6 +14,7 @@
 #include <sstream>
 #include <cstdio>
 #include <algorithm>
+#include <iterator>
 #include "utils/options.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"
@@ -1205,9 +1206,14 @@ LightningProgram::linkImpl(amd::option::Options *options)
     std::string codegenOptions(options->llvmOptions);
 
     // Set the machine target
+#if 0
     std::ostringstream mCPU;
     mCPU << " -mcpu=gfx" << dev().hwInfo()->gfxipVersion_;
     codegenOptions.append(mCPU.str());
+#else
+    codegenOptions.append(" -mcpu=");
+    codegenOptions.append(dev().hwInfo()->machineTarget_);
+#endif
 
     // Set the -O#
     std::ostringstream optLevel;