commit 6a94caa048121858ee8e71f84caf7b9ae1f940df
author Stephen Hines <srhines@google.com> Fri Aug 09 02:14:36 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 19 17:41:24 2013 -0700
tree 72750df266d82219b0b271c5050dd970c136103b
parent 7a7aca77b260ce9281f8efb0620d69fe2a8861bd

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)

(cherry picked from commit 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e)

Change-Id: I4fb59f291bb58c7ed8575f71a44f7c59f653a5ec

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 7831cf6..90cec75 100644
--- a/compiler/dex/portable/mir_to_gbc.cc
+++ b/compiler/dex/portable/mir_to_gbc.cc
@@ -1972,7 +1972,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 aa439cc..139100b 100644
--- a/compiler/llvm/llvm_compilation_unit.cc
+++ b/compiler/llvm/llvm_compilation_unit.cc
@@ -214,7 +214,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;
 
@@ -258,7 +257,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()) {
@@ -278,7 +277,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);