diff options
| author | 2013-08-13 01:43:13 -0700 | |
|---|---|---|
| committer | 2013-08-13 01:43:13 -0700 | |
| commit | e265ecf1d24d6da34beafe2340fa5aadaccc9c7f (patch) | |
| tree | 8052160b79d9fa7b18d51a5e42036be22ceb8915 /compiler/llvm/llvm_compilation_unit.cc | |
| parent | 306eb0af2717a27e95637ebfbef141bb7e6fb369 (diff) | |
| parent | 34de74bb9d91534ab7ebbd1f73ee1d96db894b4c (diff) | |
am 34de74bb: Merge "Update ART for LLVM merge up to r187914." into klp-dev
* commit '34de74bb9d91534ab7ebbd1f73ee1d96db894b4c':
Update ART for LLVM merge up to r187914.
Diffstat (limited to 'compiler/llvm/llvm_compilation_unit.cc')
| -rw-r--r-- | compiler/llvm/llvm_compilation_unit.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc index 9296fc7050..7542b841a1 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -214,7 +214,6 @@ bool LlvmCompilationUnit::MaterializeToRawOStream(::llvm::raw_ostream& out_strea ::llvm::TargetOptions target_options; target_options.FloatABIType = ::llvm::FloatABI::Soft; target_options.NoFramePointerElim = true; - target_options.NoFramePointerElimNonLeaf = true; target_options.UseSoftFloat = false; target_options.EnableFastISel = false; @@ -258,7 +257,7 @@ bool LlvmCompilationUnit::MaterializeToRawOStream(::llvm::raw_ostream& out_strea ::llvm::OwningPtr< ::llvm::tool_output_file> out_file( new ::llvm::tool_output_file(bitcode_filename_.c_str(), errmsg, - ::llvm::raw_fd_ostream::F_Binary)); + ::llvm::sys::fs::F_Binary)); if (!errmsg.empty()) { @@ -278,7 +277,6 @@ bool LlvmCompilationUnit::MaterializeToRawOStream(::llvm::raw_ostream& out_strea // pm_builder.Inliner = ::llvm::createAlwaysInlinerPass(); // pm_builder.Inliner = ::llvm::createPartialInliningPass(); pm_builder.OptLevel = 3; - pm_builder.DisableSimplifyLibCalls = 1; pm_builder.DisableUnitAtATime = 1; pm_builder.populateFunctionPassManager(fpm); pm_builder.populateModulePassManager(pm); |