Remove deprecated_command_loop_hook.

  https://sourceware.org/ml/gdb-patches/2013-09/msg00174.html

gdb/ChangeLog

        * gdb/defs.h (deprecated_command_loop_hook): Remove, including
        references in comments.
        * gdb/interps.c (current_interp_command_loop): No longer use
        deprecated_command_loop_hook.
        (clear_interpreter_hooks): Remove deprecated_command_loop_hook
        setup.
        * gdb/top.c (deprecated_command_loop_hook): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 92452a90ac2921bfdd3cde871627c48a1d90893c..18ee8c8d8b66691792000795bb5082b9ec0fa925 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2013-09-05  Andrew Burgess  <aburgess@broadcom.com>
+
+       * gdb/defs.h (deprecated_command_loop_hook): Remove, including
+       references in comments.
+       * gdb/interps.c (current_interp_command_loop): No longer use
+       deprecated_command_loop_hook.
+       (clear_interpreter_hooks): Remove deprecated_command_loop_hook
+       setup.
+       * gdb/top.c (deprecated_command_loop_hook): Remove.
+
 2013-09-05  Pedro Alves  <palves@redhat.com>
 
        * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): 'dwarf_regnum'

diff --git a/gdb/defs.h b/gdb/defs.h
index 1e5521fc371bc1038e3fa20916aa232dfb85d38d..50b9bfe09c38aa43388c194d230dbbb4a00aee5c 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -703,10 +703,8 @@ extern int watchdog;
 extern char *interpreter_p;
 
 /* If a given interpreter matches INTERPRETER_P then it should update
-   deprecated_command_loop_hook and deprecated_init_ui_hook with the
-   per-interpreter implementation.  */
-/* FIXME: deprecated_command_loop_hook and deprecated_init_ui_hook
-   should be moved here.  */
+   deprecated_init_ui_hook with the per-interpreter implementation.  */
+/* FIXME: deprecated_init_ui_hook should be moved here.  */
 
 struct target_waitstatus;
 struct cmd_list_element;
@@ -716,7 +714,6 @@ extern void (*deprecated_post_add_symbol_hook) (void);
 extern void (*selected_frame_level_changed_hook) (int);
 extern int (*deprecated_ui_loop_hook) (int signo);
 extern void (*deprecated_init_ui_hook) (char *argv0);
-extern void (*deprecated_command_loop_hook) (void);
 extern void (*deprecated_show_load_progress) (const char *section,
                                              unsigned long section_sent, 
                                              unsigned long section_size, 

diff --git a/gdb/interps.c b/gdb/interps.c
index 25500d6e835b16000ee78ca404c3d2d62b1c0fab..33e0f721ac4ed057e83a8eb06d50c439ddca85c6 100644 (file)
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -320,12 +320,9 @@ void
 current_interp_command_loop (void)
 {
   /* Somewhat messy.  For the moment prop up all the old ways of
-     selecting the command loop.  `deprecated_command_loop_hook'
-     should be deprecated.  */
-  if (deprecated_command_loop_hook != NULL)
-    deprecated_command_loop_hook ();
-  else if (current_interpreter != NULL
-          && current_interpreter->procs->command_loop_proc != NULL)
+     selecting the command loop.  */
+  if (current_interpreter != NULL
+      && current_interpreter->procs->command_loop_proc != NULL)
     current_interpreter->procs->command_loop_proc (current_interpreter->data);
   else
     cli_command_loop ();
@@ -386,7 +383,6 @@ clear_interpreter_hooks (void)
   deprecated_target_wait_hook = 0;
   deprecated_call_command_hook = 0;
   deprecated_error_begin_hook = 0;
-  deprecated_command_loop_hook = 0;
 }
 
 /* This is a lazy init routine, called the first time the interpreter

diff --git a/gdb/top.c b/gdb/top.c
index bb7126365799a2b76bbd1fb9f6840f90af82114f..b3e7d37536056b3c9fbcfb2c8d39c074244f3b8b 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -199,11 +199,6 @@ void (*deprecated_init_ui_hook) (char *argv0);
 
 int (*deprecated_ui_loop_hook) (int);
 
-/* Called instead of command_loop at top level.  Can be invoked via
-   throw_exception().  */
-
-void (*deprecated_command_loop_hook) (void);
-
 
 /* Called from print_frame_info to list the line we stopped in.  */