From 1c5327800e5b2c03e7c56c75f98177544ca0d84f Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Wed, 24 Jun 2015 18:39:38 -0400
Subject: [PATCH] P4 to Git Change 1164882 by smekhano@stas-nova-hsa on
 2015/06/24 18:29:06

	ECR #333753 - HSA HLC: Rename AMDPrelinkOpt to AMDPrelink
	This is not only handling optimization, it also contains mandatory AMDLowerToPreciseBuiltins pass.
	Also removed HSAIL only AMDLowerToPreciseBuiltins pass invocation on legacy path

	Testing: precheckin
	Reviewed by Brian Sumner and Evgeny Mankov

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#126 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDPrelink.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDPrelinkOpt.h#5 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/AMDPrelink.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/AMDPrelinkOpt.cpp#7 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/Android.mk#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/CMakeLists.txt#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/llvm-link/llvm-link.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/include/llvm/AMDPrelink.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/include/llvm/AMDPrelinkOpt.h#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/AMDPrelink.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/AMDPrelinkOpt.cpp#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/Android.mk#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/tools/llvm-link/llvm-link.cpp#4 edit


[ROCm/clr commit: 829daa3d18dd549827e955a2dc81c69f8635afc4]
---
 projects/clr/rocclr/compiler/lib/backends/common/linker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
index a27cfece89..9cedf0b0f4 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
@@ -43,7 +43,7 @@
 
 #include "llvm/AMDFixupKernelModule.h"
 #include "llvm/AMDResolveLinker.h"
-#include "llvm/AMDPrelinkOpt.h"
+#include "llvm/AMDPrelink.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Analysis/AMDLocalArrayUsage.h"
@@ -650,7 +650,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
   LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
 
   std::string clp_errmsg;
-  llvm::Module *OnFlyLib = AMDPrelinkOpt(LLVMBinary(), clp_errmsg);
+  llvm::Module *OnFlyLib = AMDPrelink(LLVMBinary(), clp_errmsg);
 
   if (!clp_errmsg.empty()) {
     delete LLVMBinary();