Merge pull request #1129 from Shishpan/trunkFix

Fix for rev. 254449. Changed linkModules() API
2015-12-03 13:59:23 +03:00
parent bb5cbf420c da7c2740f4
commit 2ac8ad2063
1 changed files with 4 additions and 0 deletions
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -891,7 +891,11 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
        bcModule->setDataLayout(module->getDataLayout());

        std::string(linkError);
+#if ISPC_LLVM_VERSION <= ISPC_LLVM_3_7
        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
                                      , llvm::Linker::DestroySource,
                                      &linkError))