* cpu-pj.c (scan_mach, compatible, arch_info_struct): Remove.

	(bfd_pj_arch): Use bfd_default_scan.
	* cpu-v850.c (scan): Remove.
	(N): Use bfd_default_scan.
	* cpu-z8k.c (scan_mach): Remove.
	(arch_info_struct, bfd_z8k_arch): Reorganize so that the default is
	first.  Use bfd_default_scan.

1 files changed, 2 insertions, 48 deletions

diff --git a/bfd/cpu-pj.c b/bfd/cpu-pj.c
index aeb7e589ccc..8e58c89fbd7 100644
--- a/bfd/cpu-pj.c
+++ b/bfd/cpu-pj.c
@@ -22,52 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean scan_mach
-  PARAMS ((const struct bfd_arch_info *, const char *));
-
-static boolean
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcasecmp (info->printable_name, string) == 0)
-    return true;
-  return false;
-}
-
-#if 0
-/* This routine is provided two arch_infos and returns whether
-   they'd be compatible */
-
-static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->arch != b->arch || a->mach != b->mach)
-   return NULL;
-  return a;
-}
-#endif
-
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  {
-    32,				/* 32 bits in a word */
-    32,				/* 32 bits in an address */
-    8,				/* 8 bits in a byte */
-    bfd_arch_pj,
-    0,
-    "pj",			/* arch_name  */
-    "pj",			/* printable name */
-    1,
-    false,			/* not the default */
-    bfd_default_compatible,
-    scan_mach,
-    0,
-  },
-};
-
 const bfd_arch_info_type bfd_pj_arch =
 {
   32,				/* 32 bits in a word */
@@ -80,6 +34,6 @@ const bfd_arch_info_type bfd_pj_arch =
   1,
   true,				/* the default machine */
   bfd_default_compatible,
-  scan_mach,
-  &arch_info_struct [0]
+  bfd_default_scan,
+  0
 };