0.9.17.2: fix two potential GC deadlocks

[sbcl.git] / src / runtime / sunos-os.c

diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c
index 0cccfe1..e88e950 100644 (file)
--- a/src/runtime/sunos-os.c
+++ b/src/runtime/sunos-os.c
@@ -201,11 +201,6 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
     void* fault_addr = (void*)info->si_addr;
-    if(info->si_code == 1)
-    {
-        perror("error: SEGV_MAPERR\n");
-        exit(1);
-    }
 
     if (!gencgc_handle_wp_violation(fault_addr))
          if(!handle_guard_page_triggered(context, fault_addr))
@@ -213,7 +208,7 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
             arrange_return_to_lisp_function(context,
                                             SymbolFunction(MEMORY_FAULT_ERROR));
 #else
-    interrupt_handle_now(signal, info, context);
+            interrupt_handle_now(signal, info, context);
 #endif
 }
 
@@ -239,6 +234,13 @@ os_install_interrupt_handlers()
 {
     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
                                                  sigsegv_handler);
+
+#ifdef LISP_FEATURE_SB_THREAD
+    undoably_install_low_level_interrupt_handler(SIG_INTERRUPT_THREAD,
+                                                 interrupt_thread_handler);
+    undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC,
+                                                 sig_stop_for_gc_handler);
+#endif
 }
 
 char *
@@ -253,3 +255,4 @@ os_get_runtime_executable_path()
 
     return copied_string(path);
 }
+