From b583003e103cc0a55ff90a414045a3f647ab1a6e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 22 Aug 2012 17:31:45 +0000 Subject: [PATCH] * event-top.c (sigwinch_token, handle_sigwinch): Remove. (async_init_signals): Update. * utils.c (init_page_info): Don't use SIGWINCH_HANDLER. (SIGWINCH_HANDLER_BODY): Remove. gdb/doc * gdbint.texinfo (Host Definition): Remove documentation for SIGWINCH_HANDLER and SIGWINCH_HANDLER_BODY. --- gdb/ChangeLog | 7 +++++++ gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdbint.texinfo | 8 -------- gdb/event-top.c | 22 ---------------------- gdb/utils.c | 10 ---------- 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0520e11f25..97128a0f200 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-08-22 Tom Tromey + + * event-top.c (sigwinch_token, handle_sigwinch): Remove. + (async_init_signals): Update. + * utils.c (init_page_info): Don't use SIGWINCH_HANDLER. + (SIGWINCH_HANDLER_BODY): Remove. + 2012-08-22 Tom Tromey * jit.c (jit_object_close_impl): Don't malloc the objfile diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 408ecb31e02..f2f02e35256 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2012-08-22 Tom Tromey + + * gdbint.texinfo (Host Definition): Remove documentation for + SIGWINCH_HANDLER and SIGWINCH_HANDLER_BODY. + 2012-08-17 Keith Seitz PR c++/13356 diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index c4c1cc9fffe..07493194fdc 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -2739,14 +2739,6 @@ are: The default name of @value{GDBN}'s initialization file (normally @file{.gdbinit}). -@item SIGWINCH_HANDLER -If your host defines @code{SIGWINCH}, you can define this to be the name -of a function to be called if @code{SIGWINCH} is received. - -@item SIGWINCH_HANDLER_BODY -Define this to expand into code that will define the function named by -the expansion of @code{SIGWINCH_HANDLER}. - @item CRLF_SOURCE_FILES @cindex DOS text files Define this if host files use @code{\r\n} rather than @code{\n} as a diff --git a/gdb/event-top.c b/gdb/event-top.c index 52e78523cf4..b4a67908595 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -58,9 +58,6 @@ static void handle_sigquit (int sig); static void handle_sighup (int sig); #endif static void handle_sigfpe (int sig); -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) -static void handle_sigwinch (int sig); -#endif /* Functions to be invoked by the event loop in response to signals. */ @@ -134,9 +131,6 @@ void *sighup_token; void *sigquit_token; #endif void *sigfpe_token; -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) -void *sigwinch_token; -#endif #ifdef STOP_SIGNAL void *sigtstp_token; #endif @@ -769,11 +763,6 @@ async_init_signals (void) sigfpe_token = create_async_signal_handler (async_float_handler, NULL); -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) - signal (SIGWINCH, handle_sigwinch); - sigwinch_token = - create_async_signal_handler (SIGWINCH_HANDLER, NULL); -#endif #ifdef STOP_SIGNAL sigtstp_token = create_async_signal_handler (async_stop_sig, NULL); @@ -950,17 +939,6 @@ async_float_handler (gdb_client_data arg) divide by zero causes this, so "float" is a misnomer. */ error (_("Erroneous arithmetic operation.")); } - -/* Tell the event loop what to do if SIGWINCH is received. - See event-signal.c. */ -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) -static void -handle_sigwinch (int sig) -{ - mark_async_signal_handler_wrapper (sigwinch_token); - signal (sig, handle_sigwinch); -} -#endif /* Called by do_setshow_command. */ diff --git a/gdb/utils.c b/gdb/utils.c index 607d7bcef38..b9e76ab76e0 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1714,11 +1714,6 @@ init_page_info (void) lines_per_page = UINT_MAX; } - /* FIXME: Get rid of this junk. */ -#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) - SIGWINCH_HANDLER (SIGWINCH); -#endif - /* If the output is not a terminal, don't paginate it. */ if (!ui_file_isatty (gdb_stdout)) lines_per_page = UINT_MAX; @@ -2743,11 +2738,6 @@ When set, debugging messages will be marked with seconds and microseconds."), &setdebuglist, &showdebuglist); } -/* Machine specific function to handle SIGWINCH signal. */ - -#ifdef SIGWINCH_HANDLER_BODY -SIGWINCH_HANDLER_BODY -#endif /* Print routines to handle variable size regs, etc. */ /* Temporary storage using circular buffer. */ #define NUMCELLS 16 -- 2.30.2