diff options
| author | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-07-25 11:11:24 -0400 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-08-11 14:58:30 -0700 |
| commit | 4cee06397633cede0163d4b520a979cb7a5177de (patch) | |
| tree | d40551eab4480ee24b4b3668498fdc4b4a17c01f /src/rustllvm | |
| parent | c96f62a29d6a2e61c886e7c8509aeb9a44f53164 (diff) | |
| download | rust-4cee06397633cede0163d4b520a979cb7a5177de.tar.gz rust-4cee06397633cede0163d4b520a979cb7a5177de.zip | |
Update for llvm api change.
Diffstat (limited to 'src/rustllvm')
| -rw-r--r-- | src/rustllvm/Passes.cpp | 3 | ||||
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 5 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.def.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rustllvm/Passes.cpp b/src/rustllvm/Passes.cpp index dcc549b511f..4aaffe89eea 100644 --- a/src/rustllvm/Passes.cpp +++ b/src/rustllvm/Passes.cpp @@ -1,5 +1,6 @@ #include "llvm/Analysis/Passes.h" -#include "llvm/Support/PassManagerBuilder.h" +#include "llvm/Transforms/IPO/PassManagerBuilder.h" +#include "llvm/Transforms/IPO.h" #include "llvm/PassManager.h" #include "llvm-c/Core.h" #include <cstdlib> 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; diff --git a/src/rustllvm/rustllvm.def.in b/src/rustllvm/rustllvm.def.in index 19e58eec503..545fd7f6f74 100644 --- a/src/rustllvm/rustllvm.def.in +++ b/src/rustllvm/rustllvm.def.in @@ -165,7 +165,6 @@ LLVMBuildUDiv LLVMBuildUIToFP LLVMBuildURem LLVMBuildUnreachable -LLVMBuildUnwind LLVMBuildVAArg LLVMBuildXor LLVMBuildZExt @@ -429,7 +428,6 @@ LLVMInt8TypeInContext LLVMIntPtrType LLVMIntType LLVMIntTypeInContext -LLVMInvalidateStructLayout LLVMIsAAllocaInst LLVMIsAArgument LLVMIsABasicBlock |