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

Merge pull request #1129 from Shishpan/trunkFix

Browse Source 
Fix for rev. 254449. Changed linkModules() API
This commit is contained in:
Dmitry Babokin
2015-12-03 13:59:23 +03:00
parent bb5cbf420c da7c2740f4
commit 2ac8ad2063
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtins.cpp
View File

@@ -891,7 +891,11 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
bcModule->setDataLayout(module->getDataLayout()); bcModule->setDataLayout(module->getDataLayout());
std::string(linkError); std::string(linkError);
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_7
if (llvm::Linker::LinkModules(module, bcModule if (llvm::Linker::LinkModules(module, bcModule
#else // LLVM 3.8+
if (llvm::Linker::linkModules(*module, *bcModule
#endif
#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5 #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5
, llvm::Linker::DestroySource, , llvm::Linker::DestroySource,
&linkError)) &linkError))