- Determine whether the simulator is being used in globals.h

runtime/vm/signal_handler_android.cc

Index: runtime/vm/signal_handler_android.cc
diff --git a/runtime/vm/signal_handler_android.cc b/runtime/vm/signal_handler_android.cc
index bbde84d81fbd9d4af3885c0df2599c1722509fe7..cc42e69859aab55b699158edc0dab91643aa63c2 100644
--- a/runtime/vm/signal_handler_android.cc
+++ b/runtime/vm/signal_handler_android.cc
@@ -12,13 +12,13 @@ namespace dart {
 uintptr_t SignalHandler::GetProgramCounter(const mcontext_t& mcontext) {
   uintptr_t pc = 0;
 
-#if defined(TARGET_ARCH_ARM)
+#if defined(HOST_ARCH_ARM)
   pc = static_cast<uintptr_t>(mcontext.arm_pc);
-#elif defined(TARGET_ARCH_ARM64)
+#elif defined(HOST_ARCH_ARM64)
   pc = static_cast<uintptr_t>(mcontext.pc);
 #else
-  UNIMPLEMENTED();
-#endif  // TARGET_ARCH_...
+#error Unsupported architecture.
+#endif  // HOST_ARCH_...
   return pc;
 }
 
@@ -26,13 +26,13 @@ uintptr_t SignalHandler::GetProgramCounter(const mcontext_t& mcontext) {
 uintptr_t SignalHandler::GetFramePointer(const mcontext_t& mcontext) {
   uintptr_t fp = 0;
 
-#if defined(TARGET_ARCH_ARM)
+#if defined(HOST_ARCH_ARM)
   fp = static_cast<uintptr_t>(mcontext.arm_fp);
-#elif defined(TARGET_ARCH_ARM64)
+#elif defined(HOST_ARCH_ARM64)
   fp = static_cast<uintptr_t>(mcontext.regs[29]);
 #else
-  UNIMPLEMENTED();
-#endif  // TARGET_ARCH_...
+#error Unsupported architecture.
+#endif  // HOST_ARCH_...
 
   return fp;
 }
@@ -41,13 +41,13 @@ uintptr_t SignalHandler::GetFramePointer(const mcontext_t& mcontext) {
 uintptr_t SignalHandler::GetCStackPointer(const mcontext_t& mcontext) {
   uintptr_t sp = 0;
 
-#if defined(TARGET_ARCH_ARM)
+#if defined(HOST_ARCH_ARM)
   sp = static_cast<uintptr_t>(mcontext.arm_sp);
-#elif defined(TARGET_ARCH_ARM64)
+#elif defined(HOST_ARCH_ARM64)
   sp = static_cast<uintptr_t>(mcontext.sp);
 #else
-  UNIMPLEMENTED();
-#endif  // TARGET_ARCH_...
+#error Unsupported architecture.
+#endif  // HOST_ARCH_...
   return sp;
 }
 
@@ -55,26 +55,26 @@ uintptr_t SignalHandler::GetCStackPointer(const mcontext_t& mcontext) {
 uintptr_t SignalHandler::GetDartStackPointer(const mcontext_t& mcontext) {
   uintptr_t sp = 0;
 
-#if defined(TARGET_ARCH_ARM)
+#if defined(HOST_ARCH_ARM)
   sp = static_cast<uintptr_t>(mcontext.arm_sp);
-#elif defined(TARGET_ARCH_ARM64)
+#elif defined(HOST_ARCH_ARM64)
   sp = static_cast<uintptr_t>(mcontext.regs[18]);
 #else
-  UNIMPLEMENTED();
-#endif  // TARGET_ARCH_...
+#error Unsupported architecture.
+#endif  // HOST_ARCH_...
   return sp;
 }
 
 
 uintptr_t SignalHandler::GetLinkRegister(const mcontext_t& mcontext) {
   uintptr_t lr = 0;
-#if defined(TARGET_ARCH_ARM)
+#if defined(HOST_ARCH_ARM)
   lr = static_cast<uintptr_t>(mcontext.arm_lr);
-#elif defined(TARGET_ARCH_ARM64)
+#elif defined(HOST_ARCH_ARM64)
   lr = static_cast<uintptr_t>(mcontext.regs[30]);
 #else
-  UNIMPLEMENTED();
-#endif  // TARGET_ARCH_...
+#error Unsupported architecture.
+#endif  // HOST_ARCH_...
   return lr;
 }