Merge pull request #3016 from lewurm/small-arm-cleanup

[mini-arm] remove useless case for iphone_abi

diff --combined mono/mini/mini-arm.c
index 93edb0fdafb6aa21b2b374bb62ccc65b3eef1751,1dc4df6fd9e2ed6a33c66f05d18ccb0fbcac5727..8e7e351b08070e417be7b1524e85581d2797af8e
--- 1/mono/mini/mini-arm.c
--- 2/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@@ -1083,7 -1083,9 +1083,7 @@@ mono_arch_regalloc_cost (MonoCompile *c
  void
  mono_arch_flush_icache (guint8 *code, gint size)
  {
 -#if defined(MONO_CROSS_COMPILE) || defined(__native_client__)
 -  // For Native Client we don't have to flush i-cache here,
 -  // as it's being done by dyncode interface.
 +#if defined(MONO_CROSS_COMPILE)
  #elif __APPLE__
        sys_icache_invalidate (code, size);
  #else
@@@ -5832,15 -5834,17 +5832,15 @@@ mono_arch_output_basic_block (MonoCompi
                        bb->spill_slot_defs = g_slist_prepend_mempool (cfg->mempool, bb->spill_slot_defs, ins);
                        break;
                case OP_GC_SAFE_POINT: {
 -                      const char *polling_func = NULL;
                        guint8 *buf [1];
  
                        g_assert (mono_threads_is_coop_enabled ());
  
 -                      polling_func = "mono_threads_state_poll";
                        ARM_LDR_IMM (code, ARMREG_IP, ins->sreg1, 0);
                        ARM_CMP_REG_IMM (code, ARMREG_IP, 0, 0);
                        buf [0] = code;
                        ARM_B_COND (code, ARMCOND_EQ, 0);
 -                      mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, polling_func);
 +                      mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, "mono_threads_state_poll");
                        code = emit_call_seq (cfg, code);
                        arm_patch (buf [0], code);
                        break;
@@@ -6067,13 -6071,8 +6067,8 @@@ mono_arch_emit_prolog (MonoCompile *cfg
                                reg_offset += 4;
                        }
                }
-               if (iphone_abi) {
-                       mono_emit_unwind_op_offset (cfg, code, ARMREG_LR, -4);
-                       mini_gc_set_slot_type_from_cfa (cfg, -4, SLOT_NOREF);
-               } else {
-                       mono_emit_unwind_op_offset (cfg, code, ARMREG_LR, -4);
-                       mini_gc_set_slot_type_from_cfa (cfg, -4, SLOT_NOREF);
-               }
+               mono_emit_unwind_op_offset (cfg, code, ARMREG_LR, -4);
+               mini_gc_set_slot_type_from_cfa (cfg, -4, SLOT_NOREF);
        } else {
                ARM_MOV_REG_REG (code, ARMREG_IP, ARMREG_SP);
                ARM_PUSH (code, 0x5ff0);