From 13f78033fc9765b1ab92f50ebfbf2d2c5975d93a Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 31 Jul 2013 15:36:49 +0000 Subject: [PATCH] Remove deprecated_throw_reason from mips_error. http://sourceware.org/ml/gdb-patches/2013-07/msg00777.html gdb/ChangeLog * remote-mips.c (mips_error): Replace use of deprecated_throw_reason with throw_verror. Use the error message passed to mips_error as the error message for throw_verror. --- gdb/ChangeLog | 6 ++++++ gdb/remote-mips.c | 17 ++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fa14d16f761..ee43344b7d1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-07-31 Andrew Burgess + + * remote-mips.c (mips_error): Replace use of + deprecated_throw_reason with throw_verror. Use the error message + passed to mips_error as the error message for throw_verror. + 2013-07-31 Andrew Burgess * monitor.c (monitor_interrupt_query): Replace use of diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index b769c690376..081fbd06aa7 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -488,17 +488,11 @@ static void ATTRIBUTE_NORETURN mips_error (char *string,...) { va_list args; - - va_start (args, string); + char *fmt; target_terminal_ours (); wrap_here (""); /* Force out any buffered output. */ gdb_flush (gdb_stdout); - if (error_pre_print) - fputs_filtered (error_pre_print, gdb_stderr); - vfprintf_filtered (gdb_stderr, string, args); - fprintf_filtered (gdb_stderr, "\n"); - va_end (args); gdb_flush (gdb_stderr); /* Clean up in such a way that mips_close won't try to talk to the @@ -506,11 +500,16 @@ mips_error (char *string,...) it). */ close_ports (); - printf_unfiltered ("Ending remote MIPS debugging.\n"); if (!ptid_equal (inferior_ptid, null_ptid)) target_mourn_inferior (); - deprecated_throw_reason (RETURN_ERROR); + fmt = concat (_("Ending remote MIPS debugging: "), + string, (char *) NULL); + make_cleanup (xfree, fmt); + + va_start (args, string); + throw_verror (TARGET_CLOSE_ERROR, fmt, args); + va_end (args); } /* putc_readable - print a character, displaying non-printable chars in -- 2.30.2