- if (!gencgc_handle_wp_violation(fault_addr))
- if(!handle_control_stack_guard_triggered(context,fault_addr))
- /* FIXME is this context or void_context? not that it */
- /* makes a difference currently except on linux/sparc */
- interrupt_handle_now(signal, siginfo, void_context);
+ if (!gencgc_handle_wp_violation(fault_addr))
+ if(!handle_guard_page_triggered(context,fault_addr))
+#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+ arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+#else
+ interrupt_handle_now(signal, siginfo, context);
+#endif