2005-02-09 Andrew Cagney <cagney@gnu.org>

	* NEWS: Mention removed commands.
	* m68hc11-tdep.c (show_regs): Delete, unused.
	(_initialize_m68hc11_tdep): Delete deprecated "regs" command.
	* gdb-events.sh: Delete deprecated "set eventdebug" and "show
	eventdebug" commands.
	* gdb-events.c: Regenerate.
	* gdbarch.sh: Delete deprecated "set archdebug" and "show
	archdebug" commands.
	* gdbarch.c: Regenerate.
	* cli/cli-cmds.c (init_cli_cmds): Delete deprecated "set
	remotedebug" and "show remotedebug".
	* arm-tdep.c (_initialize_arm_tdep): Delete deprecated "set arm
	disassembly-flavor", "show arm disassembly-flavor", and
	"othernames" commands.
	(arm_othernames): Delete unused function.

9 files changed, 36 insertions, 91 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 05064f24425..846f9977f57 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,21 @@
 2005-02-09  Andrew Cagney  <cagney@gnu.org>
 
+	* NEWS: Mention removed commands.
+	* m68hc11-tdep.c (show_regs): Delete, unused.
+	(_initialize_m68hc11_tdep): Delete deprecated "regs" command.
+	* gdb-events.sh: Delete deprecated "set eventdebug" and "show
+	eventdebug" commands.
+	* gdb-events.c: Regenerate.
+	* gdbarch.sh: Delete deprecated "set archdebug" and "show
+	archdebug" commands.
+	* gdbarch.c: Regenerate.
+	* cli/cli-cmds.c (init_cli_cmds): Delete deprecated "set
+	remotedebug" and "show remotedebug".
+	* arm-tdep.c (_initialize_arm_tdep): Delete deprecated "set arm
+	disassembly-flavor", "show arm disassembly-flavor", and
+	"othernames" commands.
+	(arm_othernames): Delete unused function.
+
 	* ppc-sysv-tdep.c (ppc64_sysv_abi_push_dummy_call)
 	(convert_code_addr_to_desc_addr): Convert any function code
 	address to the corresponding function's descriptor.
diff --git a/gdb/NEWS b/gdb/NEWS
index 57c6eacfc97..788c02231cb 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -3,6 +3,19 @@
 
 *** Changes since GDB 6.3
 
+* Deprecated commands removed
+
+The following commands, that were deprecated in 2000, have been
+removed:
+
+  Command				Replacement
+  set|show arm disassembly-flavor	set|show arm disassembler
+  othernames				set arm disassembler
+  set|show remotedebug			set|show debug remote
+  set|show archdebug			set|show debug arch
+  set|show eventdebug			set|show debug event
+  regs					info registers
+
 * New BSD user-level threads support
 
 It is now possible to debug programs using the user-level threads
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index b016b7072b9..6c6664f9a1e 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2461,19 +2461,6 @@ set_disassembly_style (void)
   set_arm_regname_option (current);
 }
 
-/* arm_othernames implements the "othernames" command.  This is deprecated
-   by the "set arm disassembly" command.  */
-
-static void
-arm_othernames (char *names, int n)
-{
-  /* Circle through the various flavors.  */
-  current_option = (current_option + 1) % num_disassembly_options;
-
-  disassembly_style = valid_disassembly_styles[current_option];
-  set_disassembly_style ();
-}
-
 /* Test whether the coff symbol specific value corresponds to a Thumb
    function.  */
 
@@ -2892,20 +2879,6 @@ _initialize_arm_tdep (void)
   helptext = ui_file_xstrdup (stb, &length);
   ui_file_delete (stb);
 
-  /* Add the deprecated disassembly-flavor command.  */
-  add_setshow_enum_cmd("disassembly-flavor", no_class,
-		       valid_disassembly_styles,
-		       &disassembly_style,
-		       _("Set the disassembly style."),
-		       _("Show the disassembly style."),
-		       helptext,
-		       _("The disassembly style is \"%s\"."),
-		       set_disassembly_style_sfunc, NULL,
-		       &setlist, &showlist, &new_set, &new_show);
-  deprecate_cmd (new_set, "set arm disassembly");
-  deprecate_cmd (new_show, "show arm disassembly");
-
-  /* And now add the new interface.  */
   add_setshow_enum_cmd("disassembler", no_class,
 		       valid_disassembly_styles, &disassembly_style,
 		       _("Set the disassembly style."),
@@ -2936,11 +2909,6 @@ vfp - VFP co-processor."),
 			set_fp_model_sfunc, show_fp_model,
 			&setarmcmdlist, &showarmcmdlist, NULL, NULL);
 
-  /* Add the deprecated "othernames" command.  */
-  deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames,
-			  _("Switch to the next set of register names.")),
-		 "set arm disassembly");
-
   /* Debugging flag.  */
   add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug,
 			   _("Set ARM debugging."),
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index fbe93c9020d..60ede578787 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1182,15 +1182,6 @@ This value is used to set the speed of the serial port when debugging\n\
 using remote targets.", &setlist),
 		     &showlist);
 
-  c = add_set_cmd ("remotedebug", no_class, var_zinteger,
-		   (char *) &remote_debug,
-		   "Set debugging of remote protocol.\n\
-When enabled, each packet sent or received with the remote target\n\
-is displayed.", &setlist);
-  deprecate_cmd (c, "set debug remote");
-  deprecate_cmd (deprecated_add_show_from_set (c, &showlist),
-		 "show debug remote");
-
   deprecated_add_show_from_set
     (add_set_cmd ("remote", no_class, var_zinteger,
 		  (char *) &remote_debug,
diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c
index 13ca9a94625..5bd5255adbd 100644
--- a/gdb/gdb-events.c
+++ b/gdb/gdb-events.c
@@ -18,8 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Work in progress */
 
@@ -332,19 +331,11 @@ _initialize_gdb_events (void)
   queue_event_hooks.tracepoint_modify = queue_tracepoint_modify;
   queue_event_hooks.architecture_changed = queue_architecture_changed;
 
-  c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
-		   (char *) (&gdb_events_debug), "Set event debugging.\n\
-When non-zero, event/notify debugging is enabled.", &setlist);
-  deprecate_cmd (c, "set debug event");
-  deprecate_cmd (deprecated_add_show_from_set (c, &showlist),
-		 "show debug event");
-
   deprecated_add_show_from_set (add_set_cmd ("event",
 					     class_maintenance,
 					     var_zinteger,
 					     (char *) (&gdb_events_debug),
 					     "Set event debugging.\n\
-When non-zero, event/notify debugging is enabled.", 
-					     &setdebuglist),
+When non-zero, event/notify debugging is enabled.", &setdebuglist),
 				&showdebuglist);
 }
diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh
index b56b184163e..84a6e4c509c 100755
--- a/gdb/gdb-events.sh
+++ b/gdb/gdb-events.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # User Interface Events.
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+#
+# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software
+# Foundation, Inc.
 #
 # Contributed by Cygnus Solutions.
 #
@@ -57,7 +59,8 @@ copyright ()
   cat <<EOF
 /* User Interface Events.
 
-   Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright 1999, 2001, 2002, 2004, 2005 Free Software Foundation,
+   Inc.
 
    Contributed by Cygnus Solutions.
 
@@ -471,13 +474,6 @@ do
 done
 cat <<EOF
 
-  c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
-		   (char *) (&gdb_events_debug), "Set event debugging.\n\\
-When non-zero, event/notify debugging is enabled.", &setlist);
-  deprecate_cmd (c, "set debug event");
-  deprecate_cmd (deprecated_add_show_from_set (c, &showlist),
-                 "show debug event");
-
   deprecated_add_show_from_set (add_set_cmd ("event",
 					     class_maintenance,
 					     var_zinteger,
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 1db69c2396d..172a3506b18 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -4207,13 +4207,4 @@ _initialize_gdbarch (void)
 		  "Set architecture debugging.\n\
 When non-zero, architecture debugging is enabled.", &setdebuglist),
      &showdebuglist);
-  c = add_set_cmd ("archdebug",
-		   class_maintenance,
-		   var_zinteger,
-		   (char *)&gdbarch_debug,
-		   "Set architecture debugging.\n\
-When non-zero, architecture debugging is enabled.", &setlist);
-
-  deprecate_cmd (c, "set debug arch");
-  deprecate_cmd (deprecated_add_show_from_set (c, &showlist), "show debug arch");
 }
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 1713defa7c4..89fc5b86313 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -2224,15 +2224,6 @@ _initialize_gdbarch (void)
 		  "Set architecture debugging.\\n\\
 When non-zero, architecture debugging is enabled.", &setdebuglist),
      &showdebuglist);
-  c = add_set_cmd ("archdebug",
-		   class_maintenance,
-		   var_zinteger,
-		   (char *)&gdbarch_debug,
-		   "Set architecture debugging.\\n\\
-When non-zero, architecture debugging is enabled.", &setlist);
-
-  deprecate_cmd (c, "set debug arch");
-  deprecate_cmd (deprecated_add_show_from_set (c, &showlist), "show debug arch");
 }
 EOF
 
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 069ced5c0b5..63af22e5953 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -1157,14 +1157,6 @@ m68hc11_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
     }
 }
 
-/* Same as 'info reg' but prints the registers in a different way.  */
-static void
-show_regs (char *args, int from_tty)
-{
-  m68hc11_print_registers_info (current_gdbarch, gdb_stdout,
-                                get_current_frame (), -1, 1);
-}
-
 static CORE_ADDR
 m68hc11_stack_align (CORE_ADDR addr)
 {
@@ -1574,9 +1566,5 @@ _initialize_m68hc11_tdep (void)
   register_gdbarch_init (bfd_arch_m68hc11, m68hc11_gdbarch_init);
   register_gdbarch_init (bfd_arch_m68hc12, m68hc11_gdbarch_init);
   m68hc11_init_reggroups ();
-
-  deprecate_cmd (add_com ("regs", class_vars, show_regs,
-                          "Print all registers"),
-                 "info registers");
 }