diff options
| -rw-r--r-- | src/llvm.cpp | 7 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/llvm.cpp b/src/llvm.cpp index 229f88e..678e2e4 100644 --- a/src/llvm.cpp +++ b/src/llvm.cpp @@ -30,11 +30,10 @@ #include <boost/format.hpp> -#include "llvm/Analysis/Verifier.h" -#include "llvm/Assembly/AssemblyAnnotationWriter.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/JIT.h" #include "llvm/ExecutionEngine/JITMemoryManager.h" +#include "llvm/IR/AssemblyAnnotationWriter.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/IRBuilder.h" @@ -42,6 +41,7 @@ #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/IR/Value.h" +#include "llvm/IR/Verifier.h" #include "llvm/PassManager.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/raw_os_ostream.h" @@ -502,7 +502,8 @@ LLVMEngine::finishFn(CEnv& cenv, CVal ret, const AST* retT) else builder.CreateRet(builder.CreateBitCast(llVal(ret), llType(retT), "ret")); - if (verifyFunction(*static_cast<Function*>(f), llvm::PrintMessageAction)) { + llvm::raw_os_ostream os(std::cerr); + if (verifyFunction(*static_cast<Function*>(f), &os)) { module->dump(); throw Error(Cursor(), "Broken module"); } @@ -43,8 +43,8 @@ def configure(conf): conf.env.append_unique('CXXFLAGS', '-std=c++11') conf.check_cfg( - path = 'llvm-config-3.4', - args = '--cppflags --ldflags --libs core jit native codegen ipo', + path = 'llvm-config-3.5', + args = '--cppflags --ldflags --libs --system-libs core jit native codegen ipo', package = '', uselib_store = 'LLVM') |