# define GC_MACH_THREAD_STATE x86_THREAD_STATE64
# define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
# endif
+# elif defined(ARM32)
+# define GC_THREAD_STATE_T arm_thread_state_t
+# define GC_MACH_THREAD_STATE ARM_THREAD_STATE
+# define GC_MACH_THREAD_STATE_COUNT ARM_THREAD_STATE_COUNT
# else
-# if 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
+# error define GC_THREAD_STATE_T
# endif
# ifndef GC_MACH_THREAD_STATE
# define GC_MACH_THREAD_STATE MACHINE_THREAD_STATE