2008-05-17 Pedro Alves * remote.c (kill_kludge): Delete. (remote_wait, remote_async_wait): Don't set it. (remote_kill, remote_async_kill): Don't do anything with it. --- gdb/remote.c | 24 ------------------------ 1 file changed, 24 deletions(-) Index: src/gdb/remote.c =================================================================== --- src.orig/gdb/remote.c 2008-05-17 12:40:39.000000000 +0100 +++ src/gdb/remote.c 2008-05-17 12:41:36.000000000 +0100 @@ -3320,10 +3320,6 @@ remote_async_terminal_ours (void) remote_async_terminal_ours_p = 1; } -/* If nonzero, ignore the next kill. */ - -int kill_kludge; - void remote_console_output (char *msg) { @@ -3527,7 +3523,6 @@ Packet: '%s'\n"), status->kind = TARGET_WAITKIND_SIGNALLED; status->value.sig = (enum target_signal) (((fromhex (buf[1])) << 4) + (fromhex (buf[2]))); - kill_kludge = 1; goto got_status; case 'O': /* Console output. */ @@ -3754,7 +3749,6 @@ Packet: '%s'\n"), status->kind = TARGET_WAITKIND_SIGNALLED; status->value.sig = (enum target_signal) (((fromhex (buf[1])) << 4) + (fromhex (buf[2]))); - kill_kludge = 1; goto got_status; case 'O': /* Console output. */ @@ -5272,15 +5266,6 @@ getpkt_sane (char **buf, long *sizeof_bu static void remote_kill (void) { - /* For some mysterious reason, wait_for_inferior calls kill instead of - mourn after it gets TARGET_WAITKIND_SIGNALLED. Work around it. */ - if (kill_kludge) - { - kill_kludge = 0; - target_mourn_inferior (); - return; - } - /* Use catch_errors so the user can quit from gdb even when we aren't on speaking terms with the remote system. */ catch_errors ((catch_errors_ftype *) putpkt, "k", "", RETURN_MASK_ERROR); @@ -5298,15 +5283,6 @@ remote_async_kill (void) if (target_is_async_p ()) serial_async (remote_desc, NULL, 0); - /* For some mysterious reason, wait_for_inferior calls kill instead of - mourn after it gets TARGET_WAITKIND_SIGNALLED. Work around it. */ - if (kill_kludge) - { - kill_kludge = 0; - target_mourn_inferior (); - return; - } - /* Use catch_errors so the user can quit from gdb even when we aren't on speaking terms with the remote system. */ catch_errors ((catch_errors_ftype *) putpkt, "k", "", RETURN_MASK_ERROR);