---

yaml
---
r: 31379
b: refs/heads/dist-snap
c: d9c9a2f
h: refs/heads/master
i:
  31377: ff47574
  31375: b968c2e
v: v3

Author: Elliott Slaughter

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 668e2c86a0cef422938f2e6a205c7eb8304386d1
+refs/heads/dist-snap: d9c9a2f97e73513030916f646adaed21e0503a4a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/lib/llvm.rs

@@ -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) {

branches/dist-snap/src/rustllvm/RustWrapper.cpp

@@ -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();

branches/dist-snap/src/rustllvm/rustllvm.def.in

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