commit 434ce294296b41a962a4fd86c3deb1f0f462d3e6
author Ian Rogers <irogers@google.com> Sat Mar 03 15:48:38 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 03 15:48:38 2012 -0800
tree 00961755d4b53d178f8820febbf6f352778b77f3
parent 4c17dffabb0ad062574018ba1b2e760ec34a03ee
parent c77928475995d01e1d6d2b2d6672510d01a5fce4

Merge "Fix bug in JNI compiler AAPCS padding calculation" into dalvik-dev

src/compiler_llvm/compiler_llvm.cc

diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index c94e7ea..b2a6d28 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -27,6 +27,7 @@
 
 #include <llvm/LinkAllPasses.h>
 #include <llvm/LinkAllVMCore.h>
+#include <llvm/Support/CommandLine.h>
 #include <llvm/Support/ManagedStatic.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/Threading.h>
@@ -35,6 +36,10 @@
   extern bool TimePassesIsEnabled;
 }
 
+extern llvm::cl::opt<bool> EnableARMLongCalls;
+// NOTE: Although EnableARMLongCalls is defined in llvm/lib/Target/ARM/
+// ARMISelLowering.cpp, however, it is not in the llvm namespace.
+
 
 namespace {
 
@@ -51,6 +56,9 @@
   llvm::InitializeAllAsmParsers();
   // TODO: Maybe we don't have to initialize "all" targets.
 
+  // Enable -arm-long-calls
+  EnableARMLongCalls = true;
+
   // Initialize LLVM optimization passes
   llvm::PassRegistry &registry = *llvm::PassRegistry::getPassRegistry();