diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7fdda1ea003..90ca1844aa5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* i386nbsd-tdep.c (i386nbsd_aout_supply_regset): Remove.
+	(i386nbsd_aout_regset_from_core_section): Likewise.
+	(i386nbsd_aout_init_abi): Likewise.
+	(_initialize_i386nbsd_tdep): Do not register i386nbsd_aout_init_abi.
+
+	* vaxnbsd-tdep.c (vaxnbsd_aout_init_abi): Remove.
+	(_initialize_vaxnbsd_tdep): Do not register vaxnbsd_aout_init_abi.
+
 2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* amd64fsdb-tdep.c (amd64fbsd_sigtramp_start_addr): Use ULL suffix.
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index bb711646cc7..6772639c930 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -56,41 +56,6 @@ static int i386nbsd_r_reg_offset[] =
   15 * 4			/* %gs */
 };
 
-static void
-i386nbsd_aout_supply_regset (const struct regset *regset,
-			     struct regcache *regcache, int regnum,
-			     const void *regs, size_t len)
-{
-  const struct gdbarch_tdep *tdep = gdbarch_tdep (regset->arch);
-
-  gdb_assert (len >= tdep->sizeof_gregset + I387_SIZEOF_FSAVE);
-
-  i386_supply_gregset (regset, regcache, regnum, regs, tdep->sizeof_gregset);
-  i387_supply_fsave (regcache, regnum, (char *) regs + tdep->sizeof_gregset);
-}
-
-static const struct regset *
-i386nbsd_aout_regset_from_core_section (struct gdbarch *gdbarch,
-					const char *sect_name,
-					size_t sect_size)
-{
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
-  /* NetBSD a.out core dumps don't use seperate register sets for the
-     general-purpose and floating-point registers.  */
-
-  if (strcmp (sect_name, ".reg") == 0
-      && sect_size >= tdep->sizeof_gregset + I387_SIZEOF_FSAVE)
-    {
-      if (tdep->gregset == NULL)
-        tdep->gregset =
-	  regset_alloc (gdbarch, i386nbsd_aout_supply_regset, NULL);
-      return tdep->gregset;
-    }
-
-  return NULL;
-}
-
 /* Under NetBSD/i386, signal handler invocations can be identified by the
    designated code sequence that is used to return from a signal handler.
    In particular, the return address of a signal handler points to the
@@ -242,18 +207,6 @@ i386nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sc_num_regs = ARRAY_SIZE (i386nbsd_sc_reg_offset);
 }
 
-/* NetBSD a.out.  */
-
-static void
-i386nbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-  i386nbsd_init_abi (info, gdbarch);
-
-  /* NetBSD a.out has a single register set.  */
-  set_gdbarch_regset_from_core_section
-    (gdbarch, i386nbsd_aout_regset_from_core_section);
-}
-
 /* NetBSD ELF.  */
 
 static void
@@ -278,8 +231,6 @@ i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 void
 _initialize_i386nbsd_tdep (void)
 {
-  gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_AOUT,
-			  i386nbsdaout_init_abi);
   gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_NETBSD_ELF,
 			  i386nbsdelf_init_abi);
 }
diff --git a/gdb/vaxnbsd-tdep.c b/gdb/vaxnbsd-tdep.c
index f1173ca4e95..84fa6ff8039 100644
--- a/gdb/vaxnbsd-tdep.c
+++ b/gdb/vaxnbsd-tdep.c
@@ -26,13 +26,6 @@
 
 #include "gdb_string.h"
 
-/* NetBSD a.out.  */
-
-static void
-vaxnbsd_aout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-{
-}
-
 /* NetBSD ELF.  */
 
 static void
@@ -50,8 +43,6 @@ void _initialize_vaxnbsd_tdep (void);
 void
 _initialize_vaxnbsd_tdep (void)
 {
-  gdbarch_register_osabi (bfd_arch_vax, 0, GDB_OSABI_NETBSD_AOUT,
-			  vaxnbsd_aout_init_abi);
   gdbarch_register_osabi (bfd_arch_vax, 0, GDB_OSABI_NETBSD_ELF,
 			  vaxnbsd_elf_init_abi);
 }