From 09c85802ff5e8b6bcae8cd7a0bc9de3cc5517134 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 18 Sep 2014 14:03:26 -0400 Subject: [PATCH] P4 to Git Change 1078307 by mbareghe@mbareghe_staging_win30 on 2014/09/18 13:54:53 ECR #304775 - clp re-implementation - Back out changelist 1077873 to investigate smoke_clang failures Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/build/Makefile.clp#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/clpVectorExpansion.cpp#26 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#112 edit ... //depot/stg/opencl/drivers/opencl/library/common/src/commonConversions.cl#15 edit ... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/build/Makefile.hsail#34 edit ... //depot/stg/opencl/drivers/opencl/library/x86/gen/build/Makefile.gen#15 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 4ba4efa48c..1c57d2a906 100644 --- a/rocclr/compiler/lib/backends/common/linker.cpp +++ b/rocclr/compiler/lib/backends/common/linker.cpp @@ -98,7 +98,7 @@ static const char* OptionMaskFName = "__option_mask"; extern llvm::Module* -clpVectorExpansion(llvm::Module *srcModules[], std::string &errorMsg, bool IsGPU); +clpVectorExpansion(llvm::Module *srcModules[], std::string &errorMsg); namespace amd { namespace { @@ -938,7 +938,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector &libs) clp_inputs[0] = LLVMBinary(); clp_inputs[1] = NULL; std::string clp_errmsg; - llvm::Module *OnFlyLib = clpVectorExpansion (clp_inputs, clp_errmsg, IsGPUTarget); + llvm::Module *OnFlyLib = clpVectorExpansion (clp_inputs, clp_errmsg); if (clp_errmsg.empty() == false) { delete LLVMBinary(); for (unsigned int i = 0; i < LibMs.size(); ++ i) {