From 8f566200754c26056e9ffdd0dbba3be4c08c0a34 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 20 Nov 2014 02:27:54 -0500
Subject: [PATCH] P4 to Git Change 1098949 by emankov@em-hsa-amd on 2014/11/20
 02:16:39

	ECR #333753 - Compiler Lib/aoc2/devloader: move devloader functionality into aoc2

	[Purpose] To get rid of obsolete runtimenew dependency in compiler

	1.      Devloader functionality moved into aoc2;
	2.      Devloader is removed from the tree & make system;
	3.      Related changes in test_driver.pl;
	4.      Functions alignedMalloc & alignedFree are moved to libUtils.h;
	5.      Function aclHsaLoader is renamed to _aclHsaLoader to indicate that it is not a Compiler Lib API's function.

	[Testing] make smoke, pre check-in

	[Reviewers] Nikolay Haustov, Brian Sumner

Affected files ...

... //depot/stg/opencl/drivers/opencl/Makefile#48 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.def.in#10 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/amdoclcl.def.in#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/amdoclcl.map.in#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/scClientAPI.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#13 edit
... //depot/stg/opencl/drivers/opencl/compiler/loader/devloader/Makefile#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/loader/devloader/build/Makefile#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/loader/devloader/build/Makefile.devloader#11 delete
... //depot/stg/opencl/drivers/opencl/compiler/loader/devloader/devloader.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/tools/aoc2/aoc2.cpp#61 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/aoc2/build/Makefile.aoc2#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#185 edit
... //depot/stg/opencl/drivers/opencl/tests/hsa/bin/test_driver.pl#5 edit
---
 opencl/api/opencl/amdocl/amdocl.def.in | 1 +
 opencl/api/opencl/amdocl/amdocl.map.in | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/opencl/api/opencl/amdocl/amdocl.def.in b/opencl/api/opencl/amdocl/amdocl.def.in
index 62a59dd2c7..7b2fafe715 100644
--- a/opencl/api/opencl/amdocl/amdocl.def.in
+++ b/opencl/api/opencl/amdocl/amdocl.def.in
@@ -155,6 +155,7 @@ aclConvertType
 aclDisassemble
 aclGetDeviceBinary
 aclDumpBinary
+_aclHsaLoader
 
 oclCompilerInit
 oclCompilerFini
diff --git a/opencl/api/opencl/amdocl/amdocl.map.in b/opencl/api/opencl/amdocl/amdocl.map.in
index e05d43d93a..a552b7d896 100644
--- a/opencl/api/opencl/amdocl/amdocl.map.in
+++ b/opencl/api/opencl/amdocl/amdocl.map.in
@@ -115,6 +115,7 @@ global:
     aclRemoveSymbol;
     aclCompile;
     aclDisassemble;
+    _aclHsaLoader;
 } OPENCL_1.0;
 #endif
 
@@ -242,4 +243,5 @@ global:
     aclDisassemble;
     aclGetDeviceBinary;
     aclDumpBinary;
+    _aclHsaLoader;
 };