Merge branch 'master' into ios-unified-ts-fix

Conflicts:
	include/private/gc_priv.h

diff --cc darwin_stop_world.c
Simple merge

diff --cc include/private/gc_priv.h
index 113391f,4d9fbab..c4751d9
--- 1/include/private/gc_priv.h
--- 2/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@@ -588,20 -585,10 +586,18 @@@ GC_EXTERN GC_warn_proc GC_current_warn_
  #     define GC_MACH_THREAD_STATE       x86_THREAD_STATE64
  #     define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
  #   endif
- # else
- #   if defined(ARM32) && defined(ARM_UNIFIED_THREAD_STATE)
- #     define GC_THREAD_STATE_T                  arm_unified_thread_state_t
- #     define GC_MACH_THREAD_STATE               ARM_UNIFIED_THREAD_STATE
- #     define GC_MACH_THREAD_STATE_COUNT         ARM_UNIFIED_THREAD_STATE_COUNT
- #   elif defined(ARM32)
- #     define GC_THREAD_STATE_T                  arm_thread_state_t
- #     ifdef ARM_MACHINE_THREAD_STATE_COUNT
- #       define GC_MACH_THREAD_STATE             ARM_MACHINE_THREAD_STATE
- #       define GC_MACH_THREAD_STATE_COUNT       ARM_MACHINE_THREAD_STATE_COUNT
- #     endif
- #   else
- #     error define GC_THREAD_STATE_T
++# elif defined(ARM32) && defined(ARM_UNIFIED_THREAD_STATE)
++#   define GC_THREAD_STATE_T            arm_unified_thread_state_t
++#   define GC_MACH_THREAD_STATE         ARM_UNIFIED_THREAD_STATE
++#   define GC_MACH_THREAD_STATE_COUNT   ARM_UNIFIED_THREAD_STATE_COUNT
+ # elif defined(ARM32)
+ #   define GC_THREAD_STATE_T            arm_thread_state_t
++#   ifdef ARM_MACHINE_THREAD_STATE_COUNT
++#     define GC_MACH_THREAD_STATE       ARM_MACHINE_THREAD_STATE
++#     define GC_MACH_THREAD_STATE_COUNT ARM_MACHINE_THREAD_STATE_COUNT
 +#   endif
+ # else
+ #   error define GC_THREAD_STATE_T
  # endif
  # ifndef GC_MACH_THREAD_STATE
  #   define GC_MACH_THREAD_STATE         MACHINE_THREAD_STATE

diff --cc os_dep.c
Simple merge