gdbarch cleanups.

4 files changed, 51 insertions, 126 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ba6ef3..3dd1efa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 30 12:09:50 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* gdbarch.h, gdbarch.c: Re-indent.  Remove FIXMEs.
+	* gdbarch.sh: Re-sync with gdbarch.[hc].
+
 2000-03-29  Daniel Berlin  <dan@cgsoftware.com>
 
 	* minsyms.c (add_minsym_to_demangled_hash_table): New function.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 798eae3..bae8734 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -1,3 +1,5 @@
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
 /* Dynamic architecture support for GDB, the GNU debugger.
    Copyright 1998-1999, Free Software Foundation, Inc.
 
@@ -18,8 +20,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* *INDENT-OFF* */ /* ``typedef (f)();'' confuses indent */
-
 /* This file was created with the aid of ``gdbarch.sh''.
 
    The bourn shell script ``gdbarch.sh'' creates the files
@@ -947,7 +947,6 @@ struct gdbarch_tdep *
 gdbarch_tdep (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_tdep called\n");
   return gdbarch->tdep;
 }
@@ -957,7 +956,6 @@ const struct bfd_arch_info *
 gdbarch_bfd_arch_info (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_bfd_arch_info called\n");
   return gdbarch->bfd_arch_info;
 }
@@ -966,7 +964,6 @@ int
 gdbarch_byte_order (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_byte_order called\n");
   return gdbarch->byte_order;
 }
@@ -977,7 +974,6 @@ gdbarch_bfd_vma_bit (struct gdbarch *gdbarch)
   if (0)
     internal_error ("gdbarch: gdbarch_bfd_vma_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_bfd_vma_bit called\n");
   return gdbarch->bfd_vma_bit;
 }
@@ -995,7 +991,6 @@ gdbarch_ptr_bit (struct gdbarch *gdbarch)
   if (gdbarch->ptr_bit == 0)
     internal_error ("gdbarch: gdbarch_ptr_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_ptr_bit called\n");
   return gdbarch->ptr_bit;
 }
@@ -1013,7 +1008,6 @@ gdbarch_short_bit (struct gdbarch *gdbarch)
   if (gdbarch->short_bit == 0)
     internal_error ("gdbarch: gdbarch_short_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_short_bit called\n");
   return gdbarch->short_bit;
 }
@@ -1031,7 +1025,6 @@ gdbarch_int_bit (struct gdbarch *gdbarch)
   if (gdbarch->int_bit == 0)
     internal_error ("gdbarch: gdbarch_int_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_int_bit called\n");
   return gdbarch->int_bit;
 }
@@ -1049,7 +1042,6 @@ gdbarch_long_bit (struct gdbarch *gdbarch)
   if (gdbarch->long_bit == 0)
     internal_error ("gdbarch: gdbarch_long_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_long_bit called\n");
   return gdbarch->long_bit;
 }
@@ -1067,7 +1059,6 @@ gdbarch_long_long_bit (struct gdbarch *gdbarch)
   if (gdbarch->long_long_bit == 0)
     internal_error ("gdbarch: gdbarch_long_long_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_long_long_bit called\n");
   return gdbarch->long_long_bit;
 }
@@ -1085,7 +1076,6 @@ gdbarch_float_bit (struct gdbarch *gdbarch)
   if (gdbarch->float_bit == 0)
     internal_error ("gdbarch: gdbarch_float_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_float_bit called\n");
   return gdbarch->float_bit;
 }
@@ -1103,7 +1093,6 @@ gdbarch_double_bit (struct gdbarch *gdbarch)
   if (gdbarch->double_bit == 0)
     internal_error ("gdbarch: gdbarch_double_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_double_bit called\n");
   return gdbarch->double_bit;
 }
@@ -1121,7 +1110,6 @@ gdbarch_long_double_bit (struct gdbarch *gdbarch)
   if (gdbarch->long_double_bit == 0)
     internal_error ("gdbarch: gdbarch_long_double_bit invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_long_double_bit called\n");
   return gdbarch->long_double_bit;
 }
@@ -1139,7 +1127,6 @@ gdbarch_read_pc (struct gdbarch *gdbarch, int pid)
   if (gdbarch->read_pc == 0)
     internal_error ("gdbarch: gdbarch_read_pc invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_read_pc called\n");
   return gdbarch->read_pc (pid);
 }
@@ -1157,7 +1144,6 @@ gdbarch_write_pc (struct gdbarch *gdbarch, CORE_ADDR val, int pid)
   if (gdbarch->write_pc == 0)
     internal_error ("gdbarch: gdbarch_write_pc invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_write_pc called\n");
   gdbarch->write_pc (val, pid);
 }
@@ -1175,7 +1161,6 @@ gdbarch_read_fp (struct gdbarch *gdbarch)
   if (gdbarch->read_fp == 0)
     internal_error ("gdbarch: gdbarch_read_fp invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_read_fp called\n");
   return gdbarch->read_fp ();
 }
@@ -1193,7 +1178,6 @@ gdbarch_write_fp (struct gdbarch *gdbarch, CORE_ADDR val)
   if (gdbarch->write_fp == 0)
     internal_error ("gdbarch: gdbarch_write_fp invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_write_fp called\n");
   gdbarch->write_fp (val);
 }
@@ -1211,7 +1195,6 @@ gdbarch_read_sp (struct gdbarch *gdbarch)
   if (gdbarch->read_sp == 0)
     internal_error ("gdbarch: gdbarch_read_sp invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_read_sp called\n");
   return gdbarch->read_sp ();
 }
@@ -1229,7 +1212,6 @@ gdbarch_write_sp (struct gdbarch *gdbarch, CORE_ADDR val)
   if (gdbarch->write_sp == 0)
     internal_error ("gdbarch: gdbarch_write_sp invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_write_sp called\n");
   gdbarch->write_sp (val);
 }
@@ -1247,7 +1229,6 @@ gdbarch_num_regs (struct gdbarch *gdbarch)
   if (gdbarch->num_regs == -1)
     internal_error ("gdbarch: gdbarch_num_regs invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_num_regs called\n");
   return gdbarch->num_regs;
 }
@@ -1265,7 +1246,6 @@ gdbarch_sp_regnum (struct gdbarch *gdbarch)
   if (gdbarch->sp_regnum == -1)
     internal_error ("gdbarch: gdbarch_sp_regnum invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_sp_regnum called\n");
   return gdbarch->sp_regnum;
 }
@@ -1283,7 +1263,6 @@ gdbarch_fp_regnum (struct gdbarch *gdbarch)
   if (gdbarch->fp_regnum == -1)
     internal_error ("gdbarch: gdbarch_fp_regnum invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_fp_regnum called\n");
   return gdbarch->fp_regnum;
 }
@@ -1301,7 +1280,6 @@ gdbarch_pc_regnum (struct gdbarch *gdbarch)
   if (gdbarch->pc_regnum == -1)
     internal_error ("gdbarch: gdbarch_pc_regnum invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_pc_regnum called\n");
   return gdbarch->pc_regnum;
 }
@@ -1319,7 +1297,6 @@ gdbarch_register_name (struct gdbarch *gdbarch, int regnr)
   if (gdbarch->register_name == 0)
     internal_error ("gdbarch: gdbarch_register_name invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_name called\n");
   return gdbarch->register_name (regnr);
 }
@@ -1337,7 +1314,6 @@ gdbarch_register_size (struct gdbarch *gdbarch)
   if (gdbarch->register_size == -1)
     internal_error ("gdbarch: gdbarch_register_size invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_size called\n");
   return gdbarch->register_size;
 }
@@ -1355,7 +1331,6 @@ gdbarch_register_bytes (struct gdbarch *gdbarch)
   if (gdbarch->register_bytes == -1)
     internal_error ("gdbarch: gdbarch_register_bytes invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_bytes called\n");
   return gdbarch->register_bytes;
 }
@@ -1373,7 +1348,6 @@ gdbarch_register_byte (struct gdbarch *gdbarch, int reg_nr)
   if (gdbarch->register_byte == 0)
     internal_error ("gdbarch: gdbarch_register_byte invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_byte called\n");
   return gdbarch->register_byte (reg_nr);
 }
@@ -1391,7 +1365,6 @@ gdbarch_register_raw_size (struct gdbarch *gdbarch, int reg_nr)
   if (gdbarch->register_raw_size == 0)
     internal_error ("gdbarch: gdbarch_register_raw_size invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_raw_size called\n");
   return gdbarch->register_raw_size (reg_nr);
 }
@@ -1409,7 +1382,6 @@ gdbarch_max_register_raw_size (struct gdbarch *gdbarch)
   if (gdbarch->max_register_raw_size == -1)
     internal_error ("gdbarch: gdbarch_max_register_raw_size invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_max_register_raw_size called\n");
   return gdbarch->max_register_raw_size;
 }
@@ -1427,7 +1399,6 @@ gdbarch_register_virtual_size (struct gdbarch *gdbarch, int reg_nr)
   if (gdbarch->register_virtual_size == 0)
     internal_error ("gdbarch: gdbarch_register_virtual_size invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_virtual_size called\n");
   return gdbarch->register_virtual_size (reg_nr);
 }
@@ -1445,7 +1416,6 @@ gdbarch_max_register_virtual_size (struct gdbarch *gdbarch)
   if (gdbarch->max_register_virtual_size == -1)
     internal_error ("gdbarch: gdbarch_max_register_virtual_size invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_max_register_virtual_size called\n");
   return gdbarch->max_register_virtual_size;
 }
@@ -1463,7 +1433,6 @@ gdbarch_register_virtual_type (struct gdbarch *gdbarch, int reg_nr)
   if (gdbarch->register_virtual_type == 0)
     internal_error ("gdbarch: gdbarch_register_virtual_type invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_virtual_type called\n");
   return gdbarch->register_virtual_type (reg_nr);
 }
@@ -1481,7 +1450,6 @@ gdbarch_use_generic_dummy_frames (struct gdbarch *gdbarch)
   if (gdbarch->use_generic_dummy_frames == -1)
     internal_error ("gdbarch: gdbarch_use_generic_dummy_frames invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_use_generic_dummy_frames called\n");
   return gdbarch->use_generic_dummy_frames;
 }
@@ -1499,7 +1467,6 @@ gdbarch_call_dummy_location (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_location == 0)
     internal_error ("gdbarch: gdbarch_call_dummy_location invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_location called\n");
   return gdbarch->call_dummy_location;
 }
@@ -1517,7 +1484,6 @@ gdbarch_call_dummy_address (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_address == 0)
     internal_error ("gdbarch: gdbarch_call_dummy_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_address called\n");
   return gdbarch->call_dummy_address ();
 }
@@ -1535,7 +1501,6 @@ gdbarch_call_dummy_start_offset (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_start_offset == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_start_offset invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_start_offset called\n");
   return gdbarch->call_dummy_start_offset;
 }
@@ -1553,7 +1518,6 @@ gdbarch_call_dummy_breakpoint_offset (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_breakpoint_offset == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_breakpoint_offset invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_breakpoint_offset called\n");
   return gdbarch->call_dummy_breakpoint_offset;
 }
@@ -1571,7 +1535,6 @@ gdbarch_call_dummy_breakpoint_offset_p (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_breakpoint_offset_p == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_breakpoint_offset_p invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_breakpoint_offset_p called\n");
   return gdbarch->call_dummy_breakpoint_offset_p;
 }
@@ -1589,7 +1552,6 @@ gdbarch_call_dummy_length (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_length == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_length invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_length called\n");
   return gdbarch->call_dummy_length;
 }
@@ -1607,7 +1569,6 @@ gdbarch_pc_in_call_dummy (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp, C
   if (gdbarch->pc_in_call_dummy == 0)
     internal_error ("gdbarch: gdbarch_pc_in_call_dummy invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_pc_in_call_dummy called\n");
   return gdbarch->pc_in_call_dummy (pc, sp, frame_address);
 }
@@ -1625,7 +1586,6 @@ gdbarch_call_dummy_p (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_p == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_p invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_p called\n");
   return gdbarch->call_dummy_p;
 }
@@ -1641,7 +1601,6 @@ LONGEST *
 gdbarch_call_dummy_words (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_words called\n");
   return gdbarch->call_dummy_words;
 }
@@ -1657,7 +1616,6 @@ int
 gdbarch_sizeof_call_dummy_words (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_sizeof_call_dummy_words called\n");
   return gdbarch->sizeof_call_dummy_words;
 }
@@ -1675,7 +1633,6 @@ gdbarch_call_dummy_stack_adjust_p (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_stack_adjust_p == -1)
     internal_error ("gdbarch: gdbarch_call_dummy_stack_adjust_p invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_stack_adjust_p called\n");
   return gdbarch->call_dummy_stack_adjust_p;
 }
@@ -1693,7 +1650,6 @@ gdbarch_call_dummy_stack_adjust (struct gdbarch *gdbarch)
   if (gdbarch->call_dummy_stack_adjust_p && gdbarch->call_dummy_stack_adjust == 0)
     internal_error ("gdbarch: gdbarch_call_dummy_stack_adjust invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_call_dummy_stack_adjust called\n");
   return gdbarch->call_dummy_stack_adjust;
 }
@@ -1711,7 +1667,6 @@ gdbarch_fix_call_dummy (struct gdbarch *gdbarch, char *dummy, CORE_ADDR pc, CORE
   if (gdbarch->fix_call_dummy == 0)
     internal_error ("gdbarch: gdbarch_fix_call_dummy invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_fix_call_dummy called\n");
   gdbarch->fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p);
 }
@@ -1727,7 +1682,6 @@ int
 gdbarch_believe_pcc_promotion (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_believe_pcc_promotion called\n");
   return gdbarch->believe_pcc_promotion;
 }
@@ -1743,7 +1697,6 @@ int
 gdbarch_believe_pcc_promotion_type (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_believe_pcc_promotion_type called\n");
   return gdbarch->believe_pcc_promotion_type;
 }
@@ -1761,7 +1714,6 @@ gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, struct type *formal, st
   if (gdbarch->coerce_float_to_double == 0)
     internal_error ("gdbarch: gdbarch_coerce_float_to_double invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_coerce_float_to_double called\n");
   return gdbarch->coerce_float_to_double (formal, actual);
 }
@@ -1779,7 +1731,6 @@ gdbarch_get_saved_register (struct gdbarch *gdbarch, char *raw_buffer, int *opti
   if (gdbarch->get_saved_register == 0)
     internal_error ("gdbarch: gdbarch_get_saved_register invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_get_saved_register called\n");
   gdbarch->get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval);
 }
@@ -1797,7 +1748,6 @@ gdbarch_register_convertible (struct gdbarch *gdbarch, int nr)
   if (gdbarch->register_convertible == 0)
     internal_error ("gdbarch: gdbarch_register_convertible invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convertible called\n");
   return gdbarch->register_convertible (nr);
 }
@@ -1815,7 +1765,6 @@ gdbarch_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, struct
   if (gdbarch->register_convert_to_virtual == 0)
     internal_error ("gdbarch: gdbarch_register_convert_to_virtual invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convert_to_virtual called\n");
   gdbarch->register_convert_to_virtual (regnum, type, from, to);
 }
@@ -1833,7 +1782,6 @@ gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type, int
   if (gdbarch->register_convert_to_raw == 0)
     internal_error ("gdbarch: gdbarch_register_convert_to_raw invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_register_convert_to_raw called\n");
   gdbarch->register_convert_to_raw (type, regnum, from, to);
 }
@@ -1851,7 +1799,6 @@ gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *
   if (gdbarch->extract_return_value == 0)
     internal_error ("gdbarch: gdbarch_extract_return_value invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_return_value called\n");
   gdbarch->extract_return_value (type, regbuf, valbuf);
 }
@@ -1869,7 +1816,6 @@ gdbarch_push_arguments (struct gdbarch *gdbarch, int nargs, struct value **args,
   if (gdbarch->push_arguments == 0)
     internal_error ("gdbarch: gdbarch_push_arguments invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_push_arguments called\n");
   return gdbarch->push_arguments (nargs, args, sp, struct_return, struct_addr);
 }
@@ -1887,7 +1833,6 @@ gdbarch_push_dummy_frame (struct gdbarch *gdbarch)
   if (gdbarch->push_dummy_frame == 0)
     internal_error ("gdbarch: gdbarch_push_dummy_frame invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_frame called\n");
   gdbarch->push_dummy_frame ();
 }
@@ -1905,7 +1850,6 @@ gdbarch_push_return_address (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR sp
   if (gdbarch->push_return_address == 0)
     internal_error ("gdbarch: gdbarch_push_return_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_push_return_address called\n");
   return gdbarch->push_return_address (pc, sp);
 }
@@ -1923,7 +1867,6 @@ gdbarch_pop_frame (struct gdbarch *gdbarch)
   if (gdbarch->pop_frame == 0)
     internal_error ("gdbarch: gdbarch_pop_frame invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_pop_frame called\n");
   gdbarch->pop_frame ();
 }
@@ -1941,7 +1884,6 @@ gdbarch_d10v_make_daddr (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_make_daddr == 0)
     internal_error ("gdbarch: gdbarch_d10v_make_daddr invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_make_daddr called\n");
   return gdbarch->d10v_make_daddr (x);
 }
@@ -1959,7 +1901,6 @@ gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_make_iaddr == 0)
     internal_error ("gdbarch: gdbarch_d10v_make_iaddr invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_make_iaddr called\n");
   return gdbarch->d10v_make_iaddr (x);
 }
@@ -1977,7 +1918,6 @@ gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_daddr_p == 0)
     internal_error ("gdbarch: gdbarch_d10v_daddr_p invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_daddr_p called\n");
   return gdbarch->d10v_daddr_p (x);
 }
@@ -1995,7 +1935,6 @@ gdbarch_d10v_iaddr_p (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_iaddr_p == 0)
     internal_error ("gdbarch: gdbarch_d10v_iaddr_p invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_iaddr_p called\n");
   return gdbarch->d10v_iaddr_p (x);
 }
@@ -2013,7 +1952,6 @@ gdbarch_d10v_convert_daddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_convert_daddr_to_raw == 0)
     internal_error ("gdbarch: gdbarch_d10v_convert_daddr_to_raw invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_convert_daddr_to_raw called\n");
   return gdbarch->d10v_convert_daddr_to_raw (x);
 }
@@ -2031,7 +1969,6 @@ gdbarch_d10v_convert_iaddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x)
   if (gdbarch->d10v_convert_iaddr_to_raw == 0)
     internal_error ("gdbarch: gdbarch_d10v_convert_iaddr_to_raw invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_d10v_convert_iaddr_to_raw called\n");
   return gdbarch->d10v_convert_iaddr_to_raw (x);
 }
@@ -2049,7 +1986,6 @@ gdbarch_store_struct_return (struct gdbarch *gdbarch, CORE_ADDR addr, CORE_ADDR
   if (gdbarch->store_struct_return == 0)
     internal_error ("gdbarch: gdbarch_store_struct_return invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_store_struct_return called\n");
   gdbarch->store_struct_return (addr, sp);
 }
@@ -2067,7 +2003,6 @@ gdbarch_store_return_value (struct gdbarch *gdbarch, struct type *type, char *va
   if (gdbarch->store_return_value == 0)
     internal_error ("gdbarch: gdbarch_store_return_value invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_store_return_value called\n");
   gdbarch->store_return_value (type, valbuf);
 }
@@ -2085,7 +2020,6 @@ gdbarch_extract_struct_value_address (struct gdbarch *gdbarch, char *regbuf)
   if (gdbarch->extract_struct_value_address == 0)
     internal_error ("gdbarch: gdbarch_extract_struct_value_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_extract_struct_value_address called\n");
   return gdbarch->extract_struct_value_address (regbuf);
 }
@@ -2103,7 +2037,6 @@ gdbarch_use_struct_convention (struct gdbarch *gdbarch, int gcc_p, struct type *
   if (gdbarch->use_struct_convention == 0)
     internal_error ("gdbarch: gdbarch_use_struct_convention invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_use_struct_convention called\n");
   return gdbarch->use_struct_convention (gcc_p, value_type);
 }
@@ -2121,7 +2054,6 @@ gdbarch_frame_init_saved_regs (struct gdbarch *gdbarch, struct frame_info *frame
   if (gdbarch->frame_init_saved_regs == 0)
     internal_error ("gdbarch: gdbarch_frame_init_saved_regs invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_init_saved_regs called\n");
   gdbarch->frame_init_saved_regs (frame);
 }
@@ -2139,7 +2071,6 @@ gdbarch_init_extra_frame_info (struct gdbarch *gdbarch, int fromleaf, struct fra
   if (gdbarch->init_extra_frame_info == 0)
     internal_error ("gdbarch: gdbarch_init_extra_frame_info invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_init_extra_frame_info called\n");
   gdbarch->init_extra_frame_info (fromleaf, frame);
 }
@@ -2157,7 +2088,6 @@ gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
   if (gdbarch->skip_prologue == 0)
     internal_error ("gdbarch: gdbarch_skip_prologue invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_prologue called\n");
   return gdbarch->skip_prologue (ip);
 }
@@ -2175,7 +2105,6 @@ gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs)
   if (gdbarch->inner_than == 0)
     internal_error ("gdbarch: gdbarch_inner_than invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_inner_than called\n");
   return gdbarch->inner_than (lhs, rhs);
 }
@@ -2193,7 +2122,6 @@ gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenp
   if (gdbarch->breakpoint_from_pc == 0)
     internal_error ("gdbarch: gdbarch_breakpoint_from_pc invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_breakpoint_from_pc called\n");
   return gdbarch->breakpoint_from_pc (pcptr, lenptr);
 }
@@ -2211,7 +2139,6 @@ gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char
   if (gdbarch->memory_insert_breakpoint == 0)
     internal_error ("gdbarch: gdbarch_memory_insert_breakpoint invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_insert_breakpoint called\n");
   return gdbarch->memory_insert_breakpoint (addr, contents_cache);
 }
@@ -2229,7 +2156,6 @@ gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char
   if (gdbarch->memory_remove_breakpoint == 0)
     internal_error ("gdbarch: gdbarch_memory_remove_breakpoint invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_memory_remove_breakpoint called\n");
   return gdbarch->memory_remove_breakpoint (addr, contents_cache);
 }
@@ -2247,7 +2173,6 @@ gdbarch_decr_pc_after_break (struct gdbarch *gdbarch)
   if (gdbarch->decr_pc_after_break == -1)
     internal_error ("gdbarch: gdbarch_decr_pc_after_break invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_decr_pc_after_break called\n");
   return gdbarch->decr_pc_after_break;
 }
@@ -2265,7 +2190,6 @@ gdbarch_function_start_offset (struct gdbarch *gdbarch)
   if (gdbarch->function_start_offset == -1)
     internal_error ("gdbarch: gdbarch_function_start_offset invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_function_start_offset called\n");
   return gdbarch->function_start_offset;
 }
@@ -2283,7 +2207,6 @@ gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, CORE_ADDR gdb_ad
   if (gdbarch->remote_translate_xfer_address == 0)
     internal_error ("gdbarch: gdbarch_remote_translate_xfer_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_remote_translate_xfer_address called\n");
   gdbarch->remote_translate_xfer_address (gdb_addr, gdb_len, rem_addr, rem_len);
 }
@@ -2301,7 +2224,6 @@ gdbarch_frame_args_skip (struct gdbarch *gdbarch)
   if (gdbarch->frame_args_skip == -1)
     internal_error ("gdbarch: gdbarch_frame_args_skip invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_args_skip called\n");
   return gdbarch->frame_args_skip;
 }
@@ -2319,7 +2241,6 @@ gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_inf
   if (gdbarch->frameless_function_invocation == 0)
     internal_error ("gdbarch: gdbarch_frameless_function_invocation invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frameless_function_invocation called\n");
   return gdbarch->frameless_function_invocation (fi);
 }
@@ -2337,7 +2258,6 @@ gdbarch_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame)
   if (gdbarch->frame_chain == 0)
     internal_error ("gdbarch: gdbarch_frame_chain invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_chain called\n");
   return gdbarch->frame_chain (frame);
 }
@@ -2355,7 +2275,6 @@ gdbarch_frame_chain_valid (struct gdbarch *gdbarch, CORE_ADDR chain, struct fram
   if (gdbarch->frame_chain_valid == 0)
     internal_error ("gdbarch: gdbarch_frame_chain_valid invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_chain_valid called\n");
   return gdbarch->frame_chain_valid (chain, thisframe);
 }
@@ -2373,7 +2292,6 @@ gdbarch_frame_saved_pc (struct gdbarch *gdbarch, struct frame_info *fi)
   if (gdbarch->frame_saved_pc == 0)
     internal_error ("gdbarch: gdbarch_frame_saved_pc invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_saved_pc called\n");
   return gdbarch->frame_saved_pc (fi);
 }
@@ -2391,7 +2309,6 @@ gdbarch_frame_args_address (struct gdbarch *gdbarch, struct frame_info *fi)
   if (gdbarch->frame_args_address == 0)
     internal_error ("gdbarch: gdbarch_frame_args_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_args_address called\n");
   return gdbarch->frame_args_address (fi);
 }
@@ -2409,7 +2326,6 @@ gdbarch_frame_locals_address (struct gdbarch *gdbarch, struct frame_info *fi)
   if (gdbarch->frame_locals_address == 0)
     internal_error ("gdbarch: gdbarch_frame_locals_address invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_locals_address called\n");
   return gdbarch->frame_locals_address (fi);
 }
@@ -2427,7 +2343,6 @@ gdbarch_saved_pc_after_call (struct gdbarch *gdbarch, struct frame_info *frame)
   if (gdbarch->saved_pc_after_call == 0)
     internal_error ("gdbarch: gdbarch_saved_pc_after_call invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_saved_pc_after_call called\n");
   return gdbarch->saved_pc_after_call (frame);
 }
@@ -2445,7 +2360,6 @@ gdbarch_frame_num_args (struct gdbarch *gdbarch, struct frame_info *frame)
   if (gdbarch->frame_num_args == 0)
     internal_error ("gdbarch: gdbarch_frame_num_args invalid");
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_frame_num_args called\n");
   return gdbarch->frame_num_args (frame);
 }
@@ -3297,14 +3211,13 @@ _initialize_gdbarch ()
 				  "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\
+  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(add_show_from_set(c,&showlist),"show debug arch");
-
+  deprecate_cmd (c, "set debug arch");
+  deprecate_cmd (add_show_from_set (c, &showlist), "show debug arch");
 }
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 8d37120..e7b4e01 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1,3 +1,5 @@
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
 /* Dynamic architecture support for GDB, the GNU debugger.
    Copyright 1998-1999, Free Software Foundation, Inc.
 
@@ -18,8 +20,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* *INDENT-OFF* */ /* ``typedef (f)();'' confuses indent */
-
 /* This file was created with the aid of ``gdbarch.sh''.
 
    The bourn shell script ``gdbarch.sh'' creates the files
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 32b8d94..01520d6 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/bash
 
 # Architecture commands for GDB, the GNU debugger.
-# Copyright 1998-1999 Free Software Foundation, Inc.
+# Copyright 1998-2000 Free Software Foundation, Inc.
 #
 # This file is part of GDB.
 #
@@ -19,6 +19,22 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+compare_new ()
+{
+    file=$1
+    if ! test -r ${file}
+    then
+	echo "${file} missing? cp new-${file} ${file}" 1>&2
+    elif diff -c ${file} new-${file}
+    then
+	echo "${file} unchanged" 1>&2
+    else
+	echo "${file} has changed? cp new-${file} ${file}" 1>&2
+    fi
+}
+
+
+# Format of the input table
 read="class level macro returntype function formal actual attrib default init invalid_p fmt print print_p description"
 
 # dump out/verify the doco
@@ -259,6 +275,8 @@ fi
 copyright ()
 {
 cat <<EOF
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
 /* Dynamic architecture support for GDB, the GNU debugger.
    Copyright 1998-1999, Free Software Foundation, Inc.
 
@@ -279,8 +297,6 @@ cat <<EOF
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* *INDENT-OFF* */ /* \`\`typedef (f)();'' confuses indent */
-
 /* This file was created with the aid of \`\`gdbarch.sh''.
 
    The bourn shell script \`\`gdbarch.sh'' creates the files
@@ -742,15 +758,7 @@ extern void gdbarch_dump (void);
 EOF
 exec 1>&2
 #../move-if-change new-gdbarch.h gdbarch.h
-if ! test -r gdbarch.h
-then
-  echo "gdbarch.h missing? cp new-gdbarch.h gdbarch.h" 1>&2
-elif diff -c gdbarch.h new-gdbarch.h
-then
-  echo "gdbarch.h unchanged" 1>&2
-else
-  echo "gdbarch.h has changed? cp new-gdbarch.h gdbarch.h" 1>&2
-fi
+compare_new gdbarch.h
 
 
 #
@@ -1076,7 +1084,6 @@ struct gdbarch_tdep *
 gdbarch_tdep (struct gdbarch *gdbarch)
 {
   if (gdbarch_debug >= 2)
-    /* FIXME: gdb_std??? */
     fprintf_unfiltered (gdb_stdlog, "gdbarch_tdep called\n");
   return gdbarch->tdep;
 }
@@ -1098,7 +1105,6 @@ do
         echo "  if (gdbarch->${function} == 0)"
         echo "    internal_error (\"gdbarch: gdbarch_${function} invalid\");"
 	echo "  if (gdbarch_debug >= 2)"
-	echo "    /* FIXME: gdb_std??? */"
 	echo "    fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
         test "${actual}" = "-" && actual=""
        	if [ "${returntype}" = "void" ]
@@ -1131,7 +1137,6 @@ do
 	  echo "    internal_error (\"gdbarch: gdbarch_${function} invalid\");"
 	fi
 	echo "  if (gdbarch_debug >= 2)"
-	echo "    /* FIXME: gdb_std??? */"
 	echo "    fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
 	echo "  return gdbarch->${function};"
 	echo "}"
@@ -1149,7 +1154,6 @@ do
 	echo "gdbarch_${function} (struct gdbarch *gdbarch)"
 	echo "{"
 	echo "  if (gdbarch_debug >= 2)"
-	echo "    /* FIXME: gdb_std??? */"
 	echo "    fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
 	echo "  return gdbarch->${function};"
 	echo "}"
@@ -1965,6 +1969,8 @@ extern void _initialize_gdbarch (void);
 void
 _initialize_gdbarch ()
 {
+  struct cmd_list_element *c;
+
   add_prefix_cmd ("endian", class_support, set_endian,
 		  "Set endianness of target.",
 		  &endianlist, "set endian ", 0, &setlist);
@@ -1991,25 +1997,26 @@ _initialize_gdbarch ()
   tm_print_insn_info.memory_error_func = dis_asm_memory_error;
   tm_print_insn_info.print_address_func = dis_asm_print_address;
 
-  add_show_from_set (add_set_cmd ("archdebug",
+  add_show_from_set (add_set_cmd ("arch",
 				  class_maintenance,
 				  var_zinteger,
 				  (char *)&gdbarch_debug,
 				  "Set architecture debugging.\n\\
-When non-zero, architecture debugging is enabled.", &setlist),
-		     &showlist);
+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 (add_show_from_set (c, &showlist), "show debug arch");
 }
 EOF
 
 # close things off
 exec 1>&2
 #../move-if-change new-gdbarch.c gdbarch.c
-if ! test -r gdbarch.c
-then
-  echo "gdbarch.c missing? cp new-gdbarch.c gdbarch.c" 1>&2
-elif diff -c gdbarch.c new-gdbarch.c
-then
-  echo "gdbarch.c unchanged" 1>&2
-else
-  echo "gdbarch.c has changed? cp new-gdbarch.c gdbarch.c" 1>&2
-fi
+compare_new gdbarch.c