Don't assume we want the iOS ABI if running simarm on Mac and the EABI otherwise.

runtime/vm/simulator_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <setjmp.h>  // NOLINT
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
 
@@ skipping 3741 matching lines @@
   set_register(LR, kEndSimulatingPC);
 
   // Remember the values of callee-saved registers.
   // The code below assumes that r9 is not used as sb (static base) in
   // simulator code and therefore is regarded as a callee-saved register.
   int32_t r4_val = get_register(R4);
   int32_t r5_val = get_register(R5);
   int32_t r6_val = get_register(R6);
   int32_t r7_val = get_register(R7);
   int32_t r8_val = get_register(R8);
-#if !defined(TARGET_OS_MACOS)
+#if defined(TARGET_ABI_EABI)
   int32_t r9_val = get_register(R9);
 #endif
   int32_t r10_val = get_register(R10);
   int32_t r11_val = get_register(R11);
 
   double d8_val = 0.0;
   double d9_val = 0.0;
   double d10_val = 0.0;
   double d11_val = 0.0;
   double d12_val = 0.0;
@@ skipping 13 matching lines @@
   }
 
   // Setup the callee-saved registers with a known value. To be able to check
   // that they are preserved properly across dart execution.
   int32_t callee_saved_value = icount_;
   set_register(R4, callee_saved_value);
   set_register(R5, callee_saved_value);
   set_register(R6, callee_saved_value);
   set_register(R7, callee_saved_value);
   set_register(R8, callee_saved_value);
-#if !defined(TARGET_OS_MACOS)
+#if defined(TARGET_ABI_EABI)
   set_register(R9, callee_saved_value);
 #endif
   set_register(R10, callee_saved_value);
   set_register(R11, callee_saved_value);
 
   double callee_saved_dvalue = 0.0;
   if (TargetCPUFeatures::vfp_supported()) {
     callee_saved_dvalue = static_cast<double>(icount_);
     set_dregister(D8, callee_saved_dvalue);
     set_dregister(D9, callee_saved_dvalue);
     set_dregister(D10, callee_saved_dvalue);
     set_dregister(D11, callee_saved_dvalue);
     set_dregister(D12, callee_saved_dvalue);
     set_dregister(D13, callee_saved_dvalue);
     set_dregister(D14, callee_saved_dvalue);
     set_dregister(D15, callee_saved_dvalue);
   }
 
   // Start the simulation
   Execute();
 
   // Check that the callee-saved registers have been preserved.
   ASSERT(callee_saved_value == get_register(R4));
   ASSERT(callee_saved_value == get_register(R5));
   ASSERT(callee_saved_value == get_register(R6));
   ASSERT(callee_saved_value == get_register(R7));
   ASSERT(callee_saved_value == get_register(R8));
-#if !defined(TARGET_OS_MACOS)
+#if defined(TARGET_ABI_EABI)
   ASSERT(callee_saved_value == get_register(R9));
 #endif
   ASSERT(callee_saved_value == get_register(R10));
   ASSERT(callee_saved_value == get_register(R11));
 
   if (TargetCPUFeatures::vfp_supported()) {
     ASSERT(callee_saved_dvalue == get_dregister(D8));
     ASSERT(callee_saved_dvalue == get_dregister(D9));
     ASSERT(callee_saved_dvalue == get_dregister(D10));
     ASSERT(callee_saved_dvalue == get_dregister(D11));
     ASSERT(callee_saved_dvalue == get_dregister(D12));
     ASSERT(callee_saved_dvalue == get_dregister(D13));
     ASSERT(callee_saved_dvalue == get_dregister(D14));
     ASSERT(callee_saved_dvalue == get_dregister(D15));
   }
 
   // Restore callee-saved registers with the original value.
   set_register(R4, r4_val);
   set_register(R5, r5_val);
   set_register(R6, r6_val);
   set_register(R7, r7_val);
   set_register(R8, r8_val);
-#if !defined(TARGET_OS_MACOS)
+#if defined(TARGET_ABI_EABI)
   set_register(R9, r9_val);
 #endif
   set_register(R10, r10_val);
   set_register(R11, r11_val);
 
   if (TargetCPUFeatures::vfp_supported()) {
     set_dregister(D8, d8_val);
     set_dregister(D9, d9_val);
     set_dregister(D10, d10_val);
     set_dregister(D11, d11_val);
@@ skipping 49 matching lines @@
   set_register(kExceptionObjectReg, bit_cast<int32_t>(raw_exception));
   set_register(kStackTraceObjectReg, bit_cast<int32_t>(raw_stacktrace));
   buf->Longjmp();
 }
 
 }  // namespace dart
 
 #endif  // defined(USING_SIMULATOR)
 
 #endif  // defined TARGET_ARCH_ARM