More LLVM 3.3 changes

This commit is contained in:
kai
2013-01-11 22:46:36 +01:00
parent a11459bc31
commit 6ddb524b91
2 changed files with 6 additions and 1 deletions

View File

@@ -9,11 +9,12 @@
#include "gen/llvmcompat.h"
#include "gen/llvm.h"
#include "llvm/LinkAllVMCore.h"
#include "llvm/Linker.h"
#if LDC_LLVM_VER >= 303
#include "llvm/LinkAllIR.h"
#include "llvm/IR/LLVMContext.h"
#else
#include "llvm/LinkAllVMCore.h"
#include "llvm/LLVMContext.h"
#endif
#include "llvm/Target/TargetMachine.h"

View File

@@ -349,7 +349,11 @@ LLFunction* DtoInlineIRFunction(FuncDeclaration* fdecl)
if(errstr != "")
error(tinst->loc,
"can't parse inline LLVM IR:\n%s\n%s\n%s\nThe input string was: \n%s",
#if LDC_LLVM_VER >= 303
err.getLineContents().str().c_str(),
#else
err.getLineContents().c_str(),
#endif
(std::string(err.getColumnNo(), ' ') + '^').c_str(),
errstr.c_str(), stream.str().c_str());