From 2afc13ff80492278154c0f2156a9d32dd5ba675a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 12 Apr 2016 17:17:13 +0100 Subject: [PATCH] Eliminate prepare_to_throw_exception No longer necessary. gdb/ChangeLog: 2016-04-12 Pedro Alves * common/common-exceptions.c (exception_rethrow): Remove prepare_to_throw_exception call. * common/common-exceptions.h (prepare_to_throw_exception): Delete declaration. * exceptions.c (prepare_to_throw_exception): Delete. gdb/gdbserver/ChangeLog: 2016-04-12 Pedro Alves * utils.c (prepare_to_throw_exception): Delete. --- gdb/ChangeLog | 8 ++++++++ gdb/common/common-exceptions.c | 3 --- gdb/common/common-exceptions.h | 6 ------ gdb/exceptions.c | 5 ----- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/utils.c | 8 -------- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c14eb70..5dfd4b0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2016-04-12 Pedro Alves + * common/common-exceptions.c (exception_rethrow): Remove + prepare_to_throw_exception call. + * common/common-exceptions.h (prepare_to_throw_exception): Delete + declaration. + * exceptions.c (prepare_to_throw_exception): Delete. + +2016-04-12 Pedro Alves + * target.c (target_check_pending_interrupt): Delete. * target.h (struct target_ops) : Remove method. diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c index 829ce12..5ea8188 100644 --- a/gdb/common/common-exceptions.c +++ b/gdb/common/common-exceptions.c @@ -248,7 +248,6 @@ exception_rethrow (void) { /* Run this scope's cleanups before re-throwing to the next outermost scope. */ - prepare_to_throw_exception (); do_cleanups (all_cleanups ()); throw; } @@ -268,8 +267,6 @@ gdb_exception_sliced_copy (struct gdb_exception *to, const struct gdb_exception void throw_exception (struct gdb_exception exception) { - prepare_to_throw_exception (); - do_cleanups (all_cleanups ()); #if GDB_XCPT == GDB_XCPT_SJMP diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h index 398a2fb..54c6249 100644 --- a/gdb/common/common-exceptions.h +++ b/gdb/common/common-exceptions.h @@ -270,12 +270,6 @@ struct gdb_exception_RETURN_MASK_QUIT : public gdb_exception_RETURN_MASK_ALL /* *INDENT-ON* */ -/* Hook to allow client-specific actions to be performed prior to - throwing an exception. This function must be provided by the - client, and will be called before any cleanups are run. */ - -extern void prepare_to_throw_exception (void); - /* Throw an exception (as described by "struct gdb_exception"). Will execute a LONG JUMP to the inner most containing exception handler established using catch_exceptions() (or similar). diff --git a/gdb/exceptions.c b/gdb/exceptions.c index 7f6599f..0e60050 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -27,11 +27,6 @@ #include "serial.h" #include "gdbthread.h" -void -prepare_to_throw_exception (void) -{ -} - static void print_flush (void) { diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 8b8c2c1..0d2df72 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2016-04-12 Pedro Alves + + * utils.c (prepare_to_throw_exception): Delete. + 2016-04-05 Simon Marchi * Makefile.in ($(IPA_LIB)): Set SONAME of the IPA lib. diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c index 59bb323..37b9c89 100644 --- a/gdb/gdbserver/utils.c +++ b/gdb/gdbserver/utils.c @@ -137,11 +137,3 @@ pfildes (gdb_fildes_t fd) return plongest (fd); #endif } - -/* See common/common-exceptions.h. */ - -void -prepare_to_throw_exception (void) -{ - /* No client-specific actions required. */ -} -- 2.7.4