From 60e766397dd29d1e8e8544fe65c9291b65ccc67f Mon Sep 17 00:00:00 2001
From: foreman
Date: Fri, 14 Nov 2014 14:22:12 -0500
Subject: [PATCH] P4 to Git Change 1097207 by mbareghe@mbareghe_staging_win30
on 2014/11/14 14:11:59
ECR #304775 - Replace Trivial Relational Functions
Affected files ...
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#117 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/SPIR/AMDSPIRLoader.cpp#88 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/llvm-link/llvm-link.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/library/common/src/commonRelationals.cl#13 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/gen/build/Makefile.gen#7 edit
---
rocclr/compiler/lib/backends/common/linker.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp
index 6fdd180772..60be53aeba 100644
--- a/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/rocclr/compiler/lib/backends/common/linker.cpp
@@ -99,7 +99,7 @@
static const char* OptionMaskFName = "__option_mask";
namespace AMDSpir {
- extern void replaceTrivialConversionFunc(llvm::Module& M);
+ extern void replaceTrivialFunc(llvm::Module& M);
}
namespace amd {
@@ -903,7 +903,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector &libs)
#endif
- AMDSpir::replaceTrivialConversionFunc(*LLVMBinary());
+ AMDSpir::replaceTrivialFunc(*LLVMBinary());
if (!llvm::fixupKernelModule(LLVMBinary(), LibTargetTriple, LibDataLayout))
return 1;