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

runtime/vm/cpu_mips.cc

Index: runtime/vm/cpu_mips.cc
diff --git a/runtime/vm/cpu_mips.cc b/runtime/vm/cpu_mips.cc
index a8a7c89a19c14195b87cc108353cf5ffdc563763..5b97d32d4cbda1661ba60f4a2cc3056a842c55db 100644
--- a/runtime/vm/cpu_mips.cc
+++ b/runtime/vm/cpu_mips.cc
@@ -10,7 +10,7 @@
 #include "vm/cpuinfo.h"
 #include "vm/simulator.h"
 
-#if defined(HOST_ARCH_MIPS)
+#if !defined(USING_SIMULATOR)
 #include <asm/cachectl.h> /* NOLINT */
 #include <sys/syscall.h>  /* NOLINT */
 #include <unistd.h>  /* NOLINT */
@@ -19,7 +19,7 @@
 namespace dart {
 
 void CPU::FlushICache(uword start, uword size) {
-#if defined(HOST_ARCH_MIPS)
+#if !defined(USING_SIMULATOR)
   int res;
   // See http://www.linux-mips.org/wiki/Cacheflush_Syscall.
   res = syscall(__NR_cacheflush, start, size, ICACHE);
@@ -33,7 +33,7 @@ void CPU::FlushICache(uword start, uword size) {
 
 const char* CPU::Id() {
   return
-#if !defined(HOST_ARCH_MIPS)
+#if defined(USING_SIMULATOR)
   "sim"
 #endif  // !defined(HOST_ARCH_MIPS)
   "mips";
@@ -47,7 +47,7 @@ bool HostCPUFeatures::initialized_ = false;
 #endif
 
 
-#if defined(HOST_ARCH_MIPS)
+#if !defined(USING_SIMULATOR)
 void HostCPUFeatures::InitOnce() {
   CpuInfo::InitOnce();
   hardware_ = CpuInfo::GetCpuModel();