about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorRafael Ávila de Espíndola <respindola@mozilla.com>2011-07-25 11:11:24 -0400
committerGraydon Hoare <graydon@mozilla.com>2011-08-11 14:58:30 -0700
commit4cee06397633cede0163d4b520a979cb7a5177de (patch)
treed40551eab4480ee24b4b3668498fdc4b4a17c01f /src/rustllvm/RustWrapper.cpp
parentc96f62a29d6a2e61c886e7c8509aeb9a44f53164 (diff)
downloadrust-4cee06397633cede0163d4b520a979cb7a5177de.tar.gz
rust-4cee06397633cede0163d4b520a979cb7a5177de.zip
Update for llvm api change.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
-rw-r--r--src/rustllvm/RustWrapper.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 819b3e0f080..d953295803b 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -79,15 +79,16 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   llvm::NoFramePointerElim = true;
 
   InitializeAllTargets();
+  InitializeAllTargetMCs();
   InitializeAllAsmPrinters();
   InitializeAllAsmParsers();
-  TargetMachine::setRelocationModel(Reloc::PIC_);
   std::string Err;
   const Target *TheTarget = TargetRegistry::lookupTarget(triple, Err);
   std::string FeaturesStr;
   std::string Trip(triple);
   std::string CPUStr = llvm::sys::getHostCPUName();
-  TargetMachine *Target = TheTarget->createTargetMachine(Trip, CPUStr, FeaturesStr);
+  TargetMachine *Target =
+    TheTarget->createTargetMachine(Trip, CPUStr, FeaturesStr, Reloc::PIC_);
   bool NoVerify = false;
   PassManager *PM = unwrap<PassManager>(PMR);
   std::string ErrorInfo;