From 039e3c22825cb0177d4f853f644a56f7fc577e23 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 31 Jul 2013 12:44:33 +0000 Subject: [PATCH 1/1] Replace most uses of deprecated_throw_reason with quit. http://sourceware.org/ml/gdb-patches/2013-07/msg00778.html gdb/ChangeLog * monitor.c (monitor_interrupt_query): Replace use of deprecated_throw_reason with quit. * nto-procfs.c (interrupt_query): Likewise. * remote-fileio.c (remote_fileio_sig_exit): Likewise. * remote-mips.c (mips_kill): Likewise. * remote.c (interrupt_query): Likewise. --- gdb/ChangeLog | 9 +++++++++ gdb/monitor.c | 2 +- gdb/nto-procfs.c | 2 +- gdb/remote-fileio.c | 2 +- gdb/remote-mips.c | 3 +-- gdb/remote.c | 4 ++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca7ca86df9..fa14d16f76 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2013-07-31 Andrew Burgess + + * monitor.c (monitor_interrupt_query): Replace use of + deprecated_throw_reason with quit. + * nto-procfs.c (interrupt_query): Likewise. + * remote-fileio.c (remote_fileio_sig_exit): Likewise. + * remote-mips.c (mips_kill): Likewise. + * remote.c (interrupt_query): Likewise. + 2013-07-31 Andrew Burgess * utils.c (internal_verror): Replace use of deprecated_throw_reason diff --git a/gdb/monitor.c b/gdb/monitor.c index 3eb22493b7..d0c98662a9 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -1036,7 +1036,7 @@ monitor_interrupt_query (void) Give up (and stop debugging it)? "))) { target_mourn_inferior (); - deprecated_throw_reason (RETURN_QUIT); + quit (); } target_terminal_inferior (); diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 0c2d3a882a..5109facefb 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -694,7 +694,7 @@ interrupt_query (void) Give up (and stop debugging it)? "))) { target_mourn_inferior (); - deprecated_throw_reason (RETURN_QUIT); + quit (); } target_terminal_inferior (); diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index cc39bdf14a..5b7ef1d197 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -513,7 +513,7 @@ remote_fileio_sig_exit (void) static void async_remote_fileio_interrupt (gdb_client_data arg) { - deprecated_throw_reason (RETURN_QUIT); + quit (); } static void diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 13ea1467bc..b769c69037 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -2291,8 +2291,7 @@ Give up (and stop debugging it)? "))) printf_unfiltered ("Ending remote MIPS debugging.\n"); target_mourn_inferior (); - - deprecated_throw_reason (RETURN_QUIT); + quit (); } target_terminal_inferior (); diff --git a/gdb/remote.c b/gdb/remote.c index 1d6ac908e0..7830e67345 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5165,7 +5165,7 @@ interrupt_query (void) if (target_can_async_p ()) { signal (SIGINT, handle_sigint); - deprecated_throw_reason (RETURN_QUIT); + quit (); } else { @@ -5173,7 +5173,7 @@ interrupt_query (void) Give up (and stop debugging it)? "))) { remote_unpush_target (); - deprecated_throw_reason (RETURN_QUIT); + quit (); } } -- 2.34.1