diff options
| author | Stephen Hines <srhines@google.com> | 2013-08-09 02:14:36 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-28 17:20:31 -0700 |
| commit | eaeab46304a139da495de941e853ce9acdace175 (patch) | |
| tree | 0be84392d9b7701a4ce528158a8d1b34e53219d4 /compiler | |
| parent | 7642d13b320eccd98cfd424f160a1a6a2e49cbde (diff) | |
| download | art-eaeab46304a139da495de941e853ce9acdace175.zip art-eaeab46304a139da495de941e853ce9acdace175.tar.gz art-eaeab46304a139da495de941e853ce9acdace175.tar.bz2 | |
Update ART for LLVM merge up to r187914.
Removed NoFramePointerElimNonLeaf because this is now only specified via
a function attribute (and thus covered by existing cases).
Switch to llvm::sys::fs::F_* enums.
Remove unused DisableSimplifyLibCalls().
(cherry picked from commit 1961a2716cf02f597f06c27a0850daa2dc917586)
Change-Id: I5ee58031e423838cdc8968675192f9b63a7d867d
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, 2 insertions, 4 deletions
diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index 7831cf6..90cec75 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::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 aa439cc..139100b 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); |