diff options
| author | 2013-08-09 02:14:36 -0700 | |
|---|---|---|
| committer | 2013-08-13 22:45:57 -0700 | |
| commit | 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e (patch) | |
| tree | fb62c151d14f375bb2a1963fa5b20425b415a460 /compiler/llvm/llvm_compilation_unit.cc | |
| parent | 9a32bade16ef4794ddfc28f1659ac732ab16ec8f (diff) | |
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: Idc2e3fb73d798a62b6ebf6f55aff5c715b2c62f7
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); |