Index: i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.185
diff -u -p -r1.185 i386-tdep.c
--- i386-tdep.c	9 Apr 2004 23:26:19 -0000	1.185
+++ i386-tdep.c	13 Apr 2004 19:18:42 -0000
@@ -1814,6 +1814,16 @@ i386_svr4_sigcontext_addr (struct frame_
 }
 
 
+/* Generic COFF.  */
+
+void
+i386_coff_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  /* We typically use DWARF-in-COFF with the stabs register numbering.  */
+  set_gdbarch_dwarf_reg_to_regnum (gdbarch, i386_stab_reg_to_regnum);
+  set_gdbarch_dwarf2_reg_to_regnum (gdbarch, i386_stab_reg_to_regnum);
+}
+
 /* Generic ELF.  */
 
 void
Index: i386-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.h,v
retrieving revision 1.38
diff -u -p -r1.38 i386-tdep.h
--- i386-tdep.h	9 Apr 2004 16:28:50 -0000	1.38
+++ i386-tdep.h	13 Apr 2004 19:18:42 -0000
@@ -210,6 +210,9 @@ extern const struct regset *
   i386_regset_from_core_section (struct gdbarch *gdbarch,
 				 const char *sect_name, size_t sect_size);
 
+/* Initialize a basic COFF architecture variant.  */
+extern void i386_coff_init_abi (struct gdbarch_info, struct gdbarch *);
+
 /* Initialize a basic ELF architecture variant.  */
 extern void i386_elf_init_abi (struct gdbarch_info, struct gdbarch *);
 
Index: i386-cygwin-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-cygwin-tdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 i386-cygwin-tdep.c
--- i386-cygwin-tdep.c	30 May 2003 19:24:29 -0000	1.3
+++ i386-cygwin-tdep.c	13 Apr 2004 19:18:41 -0000
@@ -31,6 +31,8 @@ i386_cygwin_init_abi (struct gdbarch_inf
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  i386_coff_init_abi (info, gdbarch);
+
   tdep->struct_return = reg_struct_return;
 }