1.0.10.36: support for Darwin versions that support __DARWIN_UNIX03

[sbcl.git] / src / runtime / x86-64-arch.c

diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c
index 84082a0..6a6e53b 100644 (file)
--- a/src/runtime/x86-64-arch.c
+++ b/src/runtime/x86-64-arch.c
@@ -63,7 +63,11 @@ context_eflags_addr(os_context_t *context)
 #elif defined __FreeBSD__
     return &context->uc_mcontext.mc_rflags;
 #elif defined LISP_FEATURE_DARWIN
+#if defined __DARWIN_UNIX03
+    return &context->uc_mcontext->__ss.__rflags;
+#else
     return &context->uc_mcontext->ss.rflags;
+#endif
 #elif defined __OpenBSD__
     return &context->sc_eflags;
 #else
@@ -231,7 +235,6 @@ arch_handle_single_step_trap(os_context_t *context, int trap)
 void
 sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 {
-    int code = info->si_code;
     os_context_t *context = (os_context_t*)void_context;
     unsigned int trap;