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/thread.cc b/src/thread.cc
index ca97e89..394d263 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -92,7 +92,7 @@
}
void Thread::SetDebuggerUpdatesEnabled(bool enabled) {
-#if !defined(ART_USE_LLVM_COMPILER)
+#if !defined(ART_USE_PORTABLE_COMPILER)
ChangeDebuggerEntryPoint(&entrypoints_, enabled);
#else
UNIMPLEMENTED(FATAL);
@@ -1016,9 +1016,9 @@
delete wait_cond_;
delete wait_mutex_;
-#if !defined(ART_USE_LLVM_COMPILER)
- delete long_jump_context_;
-#endif
+ if (long_jump_context_ != NULL) {
+ delete long_jump_context_;
+ }
delete debug_invoke_req_;
delete instrumentation_stack_;