commit 73fbaadee029f310362c9d83a52177f00f2e5d77
author Stephen Hines <srhines@google.com> Fri Aug 09 02:14:36 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Nov 25 14:50:29 2013 -0800
tree 0dd92bf835e6a7bb610b5096249eb6e772f9e1f3
parent 26c6dce526a90a7345600f5f82050a42740d12f8

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: Ic7b311b635483a44265c89d47f37f4202a5b18f7

compiler/dex/portable/mir_to_gbc.cc

diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc
index 963cbeb..07bd2aa 100644
--- a/compiler/dex/portable/mir_to_gbc.cc
+++ b/compiler/dex/portable/mir_to_gbc.cc
@@ -1970,7 +1970,7 @@
 
     ::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;

compiler/llvm/llvm_compilation_unit.cc

diff --git a/compiler/llvm/llvm_compilation_unit.cc b/compiler/llvm/llvm_compilation_unit.cc
index feb495e..038f5dc 100644
--- a/compiler/llvm/llvm_compilation_unit.cc
+++ b/compiler/llvm/llvm_compilation_unit.cc
@@ -211,7 +211,6 @@
   ::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;
 
@@ -255,7 +254,7 @@
 
     ::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()) {
@@ -275,7 +274,6 @@
   // 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);