bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustllvm: followup latest LLVM

Browse source
This commit is contained in:
Young-il Choi 2013-03-20 20:24:39 +09:00 • committed by Brian Anderson
parent a9741bd33d
commit 4b4f48283b
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rustllvm/RustWrapper.cpp
View file

@ -15,14 +15,12 @@
//
//===----------------------------------------------------------------------===
#include "llvm/InlineAsm.h"
#include "llvm/LLVMContext.h"
#include "llvm/Linker.h"
#include "llvm/PassManager.h"
#include "llvm/IR/InlineAsm.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Analysis/Passes.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/ADT/Triple.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/Assembly/Parser.h"
@ -31,11 +29,9 @@
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Timer.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/DynamicLibrary.h"
@ -45,6 +41,10 @@
#include "llvm/ExecutionEngine/JITMemoryManager.h"
#include "llvm/ExecutionEngine/MCJIT.h"
#include "llvm/ExecutionEngine/Interpreter.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/IPO.h"
#include "llvm-c/Core.h"
#include "llvm-c/BitReader.h"
#include "llvm-c/Object.h"
@ -218,6 +218,12 @@ public:
virtual void deallocateExceptionTable(void *ET) {
llvm_unreachable("Unimplemented call");
}
virtual uint8_t* allocateDataSection(uintptr_t, unsigned int, unsigned int, bool) {
llvm_unreachable("Unimplemented call");
}
virtual bool applyPermissions(std::string*) {
llvm_unreachable("Unimplemented call");
}
};
bool RustMCJITMemoryManager::loadCrate(const char* file, std::string* err) {
@ -481,7 +487,7 @@ extern "C" LLVMModuleRef LLVMRustParseAssemblyFile(const char *Filename) {
if (m) {
return wrap(m);
} else {
LLVMRustError = d.getMessage().c_str();
LLVMRustError = d.getMessage().data();
return NULL;
}
}