diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-19 18:43:49 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-19 18:43:49 -0700 |
| commit | b7767e8db32cac29370852170871a6769388195f (patch) | |
| tree | defe5ccb637a23c09ae7daa661f3923a329813b3 /compiler/llvm | |
| parent | f96b21728e8b10e2060ad2d0de46fcacf5974260 (diff) | |
| download | art-b7767e8db32cac29370852170871a6769388195f.zip art-b7767e8db32cac29370852170871a6769388195f.tar.gz art-b7767e8db32cac29370852170871a6769388195f.tar.bz2 | |
Revert "Update ART for LLVM merge up to r187914."
This reverts commit 6a94caa048121858ee8e71f84caf7b9ae1f940df.
Diffstat (limited to 'compiler/llvm')
| -rw-r--r-- | compiler/llvm/llvm_compilation_unit.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc index 139100b..aa439cc 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); |