diff options
| author | 2013-11-25 16:24:18 -0800 | |
|---|---|---|
| committer | 2013-11-25 16:24:18 -0800 | |
| commit | 7c836e6ab5bcbb31b6f5565c9aa75039cc3f818d (patch) | |
| tree | 0dd92bf835e6a7bb610b5096249eb6e772f9e1f3 | |
| parent | fa1063b8b2fed872bb652be3737a576baeef3dc3 (diff) | |
| parent | 73fbaadee029f310362c9d83a52177f00f2e5d77 (diff) | |
am 73fbaade: Update ART for LLVM merge up to r187914.
* commit '73fbaadee029f310362c9d83a52177f00f2e5d77':
Update ART for LLVM merge up to r187914.
| -rw-r--r-- | compiler/dex/portable/mir_to_gbc.cc | 2 | ||||
| -rw-r--r-- | compiler/llvm/llvm_compilation_unit.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index 963cbeb1d1..07bd2aa979 100644 --- a/compiler/dex/portable/mir_to_gbc.cc +++ b/compiler/dex/portable/mir_to_gbc.cc @@ -1970,7 +1970,7 @@ void MirConverter::MethodMIR2Bitcode() { ::llvm::OwningPtr< ::llvm::tool_output_file> out_file( new ::llvm::tool_output_file(fname.c_str(), errmsg, - ::llvm::raw_fd_ostream::F_Binary)); + ::llvm::sys::fs::F_Binary)); if (!errmsg.empty()) { LOG(ERROR) << "Failed to create bitcode output file: " << errmsg; diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc index feb495e35f..038f5dc4eb 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -211,7 +211,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; @@ -255,7 +254,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()) { @@ -275,7 +274,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); |