aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for rev. 220741. LinkModiles emits error by itself

Browse Source
This commit is contained in:
Vsevolod Livinskiy
2014-10-29 22:52:52 +04:00
parent 0c0f69e3bf
commit 215ca762d0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtins.cpp
View File

@@ -877,10 +877,14 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
bcModule->setDataLayout(module->getDataLayout()); bcModule->setDataLayout(module->getDataLayout());
std::string(linkError); std::string(linkError);
if (llvm::Linker::LinkModules(module, bcModule, if (llvm::Linker::LinkModules(module, bcModule
llvm::Linker::DestroySource, #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
, llvm::Linker::DestroySource,
&linkError)) &linkError))
Error(SourcePos(), "Error linking stdlib bitcode: %s", linkError.c_str()); Error(SourcePos(), "Error linking stdlib bitcode: %s", linkError.c_str());
#else // LLVM 3.6+
))
#endif
lSetInternalFunctions(module); lSetInternalFunctions(module);
if (symbolTable != NULL) if (symbolTable != NULL)
lAddModuleSymbols(module, symbolTable); lAddModuleSymbols(module, symbolTable);