Remove Iceland.
ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER
is used in #ifdefs.
Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55
diff --git a/src/runtime.cc b/src/runtime.cc
index 07cd4c8..429dc32 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -57,7 +57,7 @@
#include "verifier/method_verifier.h"
#include "well_known_classes.h"
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
#include "compiler_llvm/procedure_linkage_table.h"
#endif
@@ -100,7 +100,7 @@
use_compile_time_class_path_(false),
main_thread_group_(NULL),
system_thread_group_(NULL)
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
#if defined(__arm__)
, plt_(kArm)
#elif defined(__mips__)
@@ -117,7 +117,7 @@
callee_save_methods_[i] = NULL;
}
-#if defined(ART_USE_LLVM_COMPILER)
+#if defined(ART_USE_PORTABLE_COMPILER)
CHECK(plt_.AllocateTable()) << "Failed to allocate PLT";
#endif
}