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

Merge pull request #890 from Vsevolod-Livinskij/fix_for_trunk

Browse Source 
Fix for trunk
This commit is contained in:
Dmitry Babokin
2014-10-30 12:25:09 -07:00
parent 0c0f69e3bf a239f37302
commit b07bf9f5c7
2 changed files with 9 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);

3
opt.cpp
View File

@@ -103,6 +103,9 @@
#include <llvm/Analysis/Passes.h> #include <llvm/Analysis/Passes.h>
#include <llvm/Support/raw_ostream.h> #include <llvm/Support/raw_ostream.h>
#include <llvm/Support/Dwarf.h> #include <llvm/Support/Dwarf.h>
#if !defined(LLVM_3_2) && !defined(LLVM_3_5) && !defined(LLVM_3_4) && !defined(LLVM_3_5)
#include <llvm/IR/IntrinsicInst.h>
#endif
#ifdef ISPC_IS_LINUX #ifdef ISPC_IS_LINUX
#include <alloca.h> #include <alloca.h>
#elif defined(ISPC_IS_WINDOWS) #elif defined(ISPC_IS_WINDOWS)