diff options
author | Brian Carlstrom <bdc@google.com> | 2013-11-07 11:53:15 -0800 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2013-11-07 11:53:15 -0800 |
commit | e21a40730ae51d8dfd0633dc021765a7839f70dc (patch) | |
tree | 64379248bbe3272579c7ba89254286c99ae2fe9d /compiler | |
parent | ce237e625a2bdba2322bb9d6044e83d1aa75e0ac (diff) | |
download | art-e21a40730ae51d8dfd0633dc021765a7839f70dc.zip art-e21a40730ae51d8dfd0633dc021765a7839f70dc.tar.gz art-e21a40730ae51d8dfd0633dc021765a7839f70dc.tar.bz2 |
Revert "Update ART for LLVM merge up to r187914."
This reverts commit f7ee11632e3dfda29d553d8962be9747d5ce6dfd.
Diffstat (limited to 'compiler')
-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 07bd2aa..963cbeb 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::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 038f5dc..feb495e 100644 --- a/compiler/llvm/llvm_compilation_unit.cc +++ b/compiler/llvm/llvm_compilation_unit.cc @@ -211,6 +211,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; @@ -254,7 +255,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()) { @@ -274,6 +275,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); |