diff -urpN src/gdb/gcore.c dev/gdb/gcore.c
--- src/gdb/gcore.c	2008-01-01 23:53:09.000000000 +0100
+++ dev/gdb/gcore.c	2008-01-17 09:38:48.000000000 +0100
@@ -37,7 +37,6 @@
 
 static char *default_gcore_target (void);
 static enum bfd_architecture default_gcore_arch (void);
-static unsigned long default_gcore_mach (void);
 static int gcore_memory_sections (bfd *);
 
 /* Generate a core file from the inferior process.  */
@@ -78,7 +77,6 @@ gcore_command (char *args, int from_tty)
   old_chain = make_cleanup_bfd_close (obfd);
 
   bfd_set_format (obfd, bfd_core);
-  bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ());
 
   /* An external target method must build the notes section.  */
   note_data = target_make_corefile_notes (obfd, &note_size);
@@ -118,24 +116,6 @@ gcore_command (char *args, int from_tty)
   return;
 }
 
-static unsigned long
-default_gcore_mach (void)
-{
-#if 1	/* See if this even matters...  */
-  return 0;
-#else
-
-  const struct bfd_arch_info *bfdarch = gdbarch_bfd_arch_info (current_gdbarch);
-
-  if (bfdarch != NULL)
-    return bfdarch->mach;
-  if (exec_bfd == NULL)
-    error (_("Can't find default bfd machine type (need execfile)."));
-
-  return bfd_get_mach (exec_bfd);
-#endif /* 1 */
-}
-
 static enum bfd_architecture
 default_gcore_arch (void)
 {