commit e94d9b23c52ec0f36c8a132914eac33bc707faff
author Shih-wei Liao <sliao@google.com> Tue May 22 09:01:24 2012 -0700
committer Shih-wei Liao <sliao@google.com> Mon May 28 21:04:37 2012 -0700
tree 53a3b1262f9f01f12507ec2aa1f1fd6fa774fc72
parent 024cf66d3359c015fabca8f5f3964592973e3f6e

Add dex_lang as common frontend to lir and LLVM. dex_lang + bc2lir =
Greenland

First commit of Greenland compiler: It's working in the sense of oat
tests. E.g., mm test-art-host-oat-Fibonacci. It shows the correct
bitcode before lir.

Change-Id: I91cbb02188325eb1fa605ed71ec7108fd2b0dbb9

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index d833d63..6e3cd46 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -258,10 +258,12 @@
   const char* suffix = (kIsDebugBuild ? "d" : "");
 
   // Work out the filename for the compiler library.
-#if !defined(ART_USE_LLVM_COMPILER)
-  std::string library_name(StringPrintf("art%s-compiler-%s", suffix, instruction_set_name.c_str()));
-#else
+#if defined(ART_USE_LLVM_COMPILER)
   std::string library_name(StringPrintf("art%s-compiler-llvm", suffix));
+#elif defined(ART_USE_GREENLAND_COMPILER)
+  std::string library_name(StringPrintf("art%s-compiler-greenland", suffix));
+#else
+  std::string library_name(StringPrintf("art%s-compiler-%s", suffix, instruction_set_name.c_str()));
 #endif
   std::string filename(StringPrintf(OS_SHARED_LIB_FORMAT_STR, library_name.c_str()));
 
@@ -330,7 +332,7 @@
   }
   VLOG(compiler) << "dlopen(\"" << compiler_so_name << "\", RTLD_LAZY) returned " << compiler_library_;
 
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
   // Initialize compiler_context_
   typedef void (*InitCompilerContextFn)(Compiler&);