mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove rustllvm functions which have moved upstream.

Browse source
This commit is contained in:
Elliott Slaughter 2012-06-25 09:54:12 -07:00 • committed by Graydon Hoare
parent 668e2c86a0
commit d9c9a2f97e
3 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rustc/lib/llvm.rs
View file

@ -969,10 +969,6 @@ extern mod llvm {
fn LLVMConstNamedStruct(S: TypeRef, ConstantVals: *ValueRef,
Count: c_uint) -> ValueRef;
/** Links LLVM modules together. `Src` is destroyed by this call and
must never be referenced again. */
fn LLVMLinkModules(Dest: ModuleRef, Src: ModuleRef) -> Bool;
}
fn SetInstructionCallConv(Instr: ValueRef, CC: CallConv) {

14
src/rustllvm/RustWrapper.cpp
View file

@ -61,20 +61,6 @@ extern "C" void LLVMRustAddPrintModulePass(LLVMPassManagerRef PMR,
PM->run(*unwrap(M));
}
extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) {
static std::string err;
// For some strange reason, unwrap() doesn't work here. "No matching
// function" error.
Module *DM = reinterpret_cast<Module *>(Dest);
Module *SM = reinterpret_cast<Module *>(Src);
if (Linker::LinkModules(DM, SM, Linker::DestroySource, &err)) {
LLVMRustError = err.c_str();
return false;
}
return true;
}
void LLVMInitializeX86TargetInfo();
void LLVMInitializeX86Target();
void LLVMInitializeX86TargetMC();

1
src/rustllvm/rustllvm.def.in
View file

@ -7,7 +7,6 @@ LLVMRustConstInt
LLVMRustParseBitcode
LLVMRustParseAssemblyFile
LLVMRustPrintPassTimings
LLVMLinkModules
LLVMCreateObjectFile
LLVMDisposeObjectFile
LLVMGetSections