From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 4 Nov 2014 14:01:08 +0000 (+0300)
Subject: Fix mistyped ARM_THREAD_STATE macro (Darwin/arm)
X-Git-Tag: gc7_4_4~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bfd1cd41ee055cc968952a02a7bf435e101bae0;p=gc

Fix mistyped ARM_THREAD_STATE macro (Darwin/arm)

* include/private/gc_priv.h (GC_MACH_THREAD_STATE,
GC_MACH_THREAD_STATE_COUNT): Define to ARM_THREAD_STATE[_COUNT],
respectively, instead of mistyped ARM_MACHINE_THREAD_STATE[_COUNT]
(if DARWIN and ARM32).
---

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 0ad92fc4..40295f56 100644
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -587,16 +587,12 @@ GC_EXTERN GC_warn_proc GC_current_warn_proc;
 #     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