commit c928de90ad22ecdf83c18a07008409595f13d3b1
author Ian Rogers <irogers@google.com> Wed Feb 27 14:30:44 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Feb 27 14:30:44 2013 -0800
tree 065a08f379960f7ba946318aaa742d7ddd0c94bd
parent 0f827169742aad6209d830db773a101849c32a83

Remove Iceland.

ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER
is used in #ifdefs.

Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 580da60..af0bba3 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -318,7 +318,7 @@
   // TODO: more work needed to combine initializations and allow per-method backend selection
   typedef void (*InitCompilerContextFn)(Compiler&);
   InitCompilerContextFn init_compiler_context;
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
+  if (compiler_backend_ == kPortable){
     // Initialize compiler_context_
     init_compiler_context = FindFunction<void (*)(Compiler&)>(compiler_so_name,
                                                   compiler_library_, "ArtInitCompilerContext");
@@ -331,13 +331,13 @@
 
   init_compiler_context(*this);
 
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
+  if (compiler_backend_ == kPortable) {
     jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtLLVMJniCompileMethod");
   } else {
     jni_compiler_ = FindFunction<JniCompilerFn>(compiler_so_name, compiler_library_, "ArtQuickJniCompileMethod");
   }
 
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)){
+  if (compiler_backend_ == kPortable) {
     create_invoke_stub_ =
         FindFunction<CreateInvokeStubFn>(compiler_so_name, compiler_library_, "ArtCreateLLVMInvokeStub");
   } else {
@@ -360,7 +360,7 @@
     }
   }
 
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)) {
+  if (compiler_backend_ == kPortable) {
     create_proxy_stub_ = FindFunction<CreateProxyStubFn>(
         compiler_so_name, compiler_library_, "ArtCreateProxyStub");
   }
@@ -403,7 +403,7 @@
   UninitCompilerContextFn uninit_compiler_context;
   // Uninitialize compiler_context_
   // TODO: rework to combine initialization/uninitialization
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)) {
+  if (compiler_backend_ == kPortable) {
     uninit_compiler_context = FindFunction<void (*)(Compiler&)>(compiler_so_name,
                                                     compiler_library_, "ArtUnInitCompilerContext");
   } else {
@@ -836,7 +836,7 @@
   // invoked, so this can be passed to the out-of-line runtime support code.
   direct_code = 0;
   direct_method = 0;
-  if ((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)) {
+  if (compiler_backend_ == kPortable) {
     if (sharp_type != kStatic && sharp_type != kDirect) {
       return;
     }
@@ -1647,7 +1647,7 @@
     CHECK(compiled_method != NULL) << PrettyMethod(method_idx, dex_file);
   }
   uint64_t duration_ns = NanoTime() - start_ns;
-#ifdef ART_USE_LLVM_COMPILER
+#ifdef ART_USE_PORTABLE_COMPILER
   const uint64_t kWarnMilliSeconds = 1000;
 #else
   const uint64_t kWarnMilliSeconds = 100;
@@ -1679,7 +1679,7 @@
     InsertInvokeStub(key, compiled_invoke_stub);
   }
 
-  if (((compiler_backend_ == kPortable) || (compiler_backend_ == kIceland)) && !is_static) {
+  if ((compiler_backend_ == kPortable) && !is_static) {
     const CompiledInvokeStub* compiled_proxy_stub = FindProxyStub(shorty);
     if (compiled_proxy_stub == NULL) {
       compiled_proxy_stub = (*create_proxy_stub_)(*this, shorty, shorty_len);