Index: bfd/cpu-m32c.c
===================================================================
RCS file: /cvs/src/src/bfd/cpu-m32c.c,v
retrieving revision 1.4
diff -c -3 -p -r1.4 cpu-m32c.c
*** bfd/cpu-m32c.c	2 Sep 2009 07:18:36 -0000	1.4
--- bfd/cpu-m32c.c	7 Jan 2010 15:44:35 -0000
***************
*** 22,27 ****
--- 22,40 ----
  #include "bfd.h"
  #include "libbfd.h"
  
+ /* Like bfd_default_scan but if the string is just "m32c" then
+    skip the m16c architecture.  */
+ 
+ static bfd_boolean
+ m32c_scan (const bfd_arch_info_type * info, const char * string)
+ {
+   if (strcmp (string, "m32c") == 0
+       && info->mach == bfd_mach_m16c)
+     return FALSE;
+ 
+   return bfd_default_scan (info, string);
+ }
+ 
  static const bfd_arch_info_type arch_info_struct[] =
  {
    {
*************** static const bfd_arch_info_type arch_inf
*** 35,41 ****
      3,				/* section align power */
      FALSE,			/* the default ? */
      bfd_default_compatible,	/* architecture comparison fn */
!     bfd_default_scan,		/* string to architecture convert fn */
      NULL			/* next in list */
    },
  };
--- 48,54 ----
      3,				/* section align power */
      FALSE,			/* the default ? */
      bfd_default_compatible,	/* architecture comparison fn */
!     m32c_scan,			/* string to architecture convert fn */
      NULL			/* next in list */
    },
  };
*************** const bfd_arch_info_type bfd_m32c_arch =
*** 52,57 ****
    4,				/* Section align power.  */
    TRUE,				/* The default ?  */
    bfd_default_compatible,	/* Architecture comparison fn.  */
!   bfd_default_scan,		/* String to architecture convert fn.  */
    &arch_info_struct[0],		/* Next in list.  */
  };
--- 65,70 ----
    4,				/* Section align power.  */
    TRUE,				/* The default ?  */
    bfd_default_compatible,	/* Architecture comparison fn.  */
!   m32c_scan,			/* String to architecture convert fn.  */
    &arch_info_struct[0],		/* Next in list.  */
  };