diff -uprN src0/gdb/gdbarch.sh src1/gdb/gdbarch.sh
--- src0/gdb/gdbarch.sh	2009-07-06 09:28:18.000000000 -0400
+++ src1/gdb/gdbarch.sh	2009-08-06 09:18:12.000000000 -0400
@@ -1803,7 +1803,6 @@ gdbarch_printable_names (void)
 {
   /* Accumulate a list of names based on the registed list of
      architectures. */
-  enum bfd_architecture a;
   int nr_arches = 0;
   const char **arches = NULL;
   struct gdbarch_registration *rego;
@@ -2038,8 +2037,6 @@ extern void _initialize_gdbarch (void);
 void
 _initialize_gdbarch (void)
 {
-  struct cmd_list_element *c;
-
   add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\\
 Set architecture debugging."), _("\\
 Show architecture debugging."), _("\\
diff -uprN src0/gdb/gdbarch.c src1/gdb/gdbarch.c
--- src0/gdb/gdbarch.c	2009-07-06 09:28:18.000000000 -0400
+++ src1/gdb/gdbarch.c	2009-08-06 09:18:59.000000000 -0400
@@ -3564,7 +3564,6 @@ gdbarch_printable_names (void)
 {
   /* Accumulate a list of names based on the registed list of
      architectures. */
-  enum bfd_architecture a;
   int nr_arches = 0;
   const char **arches = NULL;
   struct gdbarch_registration *rego;
@@ -3799,8 +3798,6 @@ extern void _initialize_gdbarch (void);
 void
 _initialize_gdbarch (void)
 {
-  struct cmd_list_element *c;
-
   add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\
 Set architecture debugging."), _("\
 Show architecture debugging."), _("\