diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-14 09:19:41 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-14 09:21:05 -0700 |
| commit | be6810d714bbf0c9c3c1d7d919e1aef5a3b52a20 (patch) | |
| tree | 2f908f5d7a51d4e7b028b307e5d43a9e794abc10 | |
| parent | 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e (diff) | |
| download | art-be6810d714bbf0c9c3c1d7d919e1aef5a3b52a20.zip art-be6810d714bbf0c9c3c1d7d919e1aef5a3b52a20.tar.gz art-be6810d714bbf0c9c3c1d7d919e1aef5a3b52a20.tar.bz2 | |
Revert "Update ART for LLVM merge up to r187914."
This reverts commit 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e.
| -rw-r--r-- | compiler/dex/portable/mir_to_gbc.cc | 2 | ||||
| -rw-r--r-- | compiler/llvm/llvm_compilation_unit.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index 90cec75..7831cf6 100644 --- a/compiler/dex/portable/mir_to_gbc.cc +++ b/compiler/dex/portable/mir_to_gbc.cc @@ -1972,7 +1972,7 @@ void MirConverter::MethodMIR2Bitcode() { ::llvm::OwningPtr< ::llvm::tool_output_file> out_file( new ::llvm::tool_output_file(fname.c_str(), errmsg, - ::llvm::sys::fs::F_Binary)); + ::llvm::raw_fd_ostream::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 7542b84..9296fc7 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -214,6 +214,7 @@ 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; @@ -257,7 +258,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::sys::fs::F_Binary)); + ::llvm::raw_fd_ostream::F_Binary)); if (!errmsg.empty()) { @@ -277,6 +278,7 @@ 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); |