Merge pull request #948 from ermshiperete/bug-xamarin-2394

[mono.git] / mono / mini / mini-posix.c

diff --git a/mono/mini/mini-posix.c b/mono/mini/mini-posix.c
index 67595770e964000bcc89a43a42aa4666338af225..67f5725de6ae2db75799a1b7a7f980ed203a4de6 100644 (file)
--- a/mono/mini/mini-posix.c
+++ b/mono/mini/mini-posix.c
@@ -521,6 +521,11 @@ mono_runtime_posix_install_handlers (void)
         */
        sigemptyset (&signal_set);
        sigaddset (&signal_set, mono_thread_get_abort_signal ());
+       if (mono_gc_get_suspend_signal () != -1)
+               sigaddset (&signal_set, mono_gc_get_suspend_signal ());
+       if (mono_gc_get_restart_signal () != -1)
+               sigaddset (&signal_set, mono_gc_get_restart_signal ());
+       sigaddset (&signal_set, SIGCHLD);
        sigprocmask (SIG_UNBLOCK, &signal_set, NULL);
 
        signal (SIGPIPE, SIG_IGN);
@@ -689,8 +694,8 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
                commands = fopen (template, "w");
 
                fprintf (commands, "process attach --pid %ld\n", (long) crashed_pid);
-               fprintf (commands, "script lldb.debugger.HandleCommand (\"thread list\")\n");
-               fprintf (commands, "script lldb.debugger.HandleCommand (\"thread backtrace all\")\n");
+               fprintf (commands, "thread list\n");
+               fprintf (commands, "thread backtrace all\n");
                fprintf (commands, "detach\n");
                fprintf (commands, "quit\n");
 
@@ -723,7 +728,7 @@ mono_gdb_render_native_backtraces (pid_t crashed_pid)
 #if !defined (__MACH__)
 
 gboolean
-mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoNativeThreadId thread_id, MonoNativeThreadHandle thread_handle)
+mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo *info)
 {
        g_error ("Posix systems don't support mono_thread_state_init_from_handle");
        return FALSE;