X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-m32c.c;h=423394f875e73c48f3baa0269bd2528aeb2bb091;hb=4ade44b727ee77adaa9c22719935d012e253a5e6;hp=729c32d7f8fe26bc696ca80118138c599de19fa9;hpb=cd123cb70c845b890eed231a84e6e84c92c2ef92;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-m32c.c b/bfd/cpu-m32c.c
index 729c32d7f8..423394f875 100644
--- a/bfd/cpu-m32c.c
+++ b/bfd/cpu-m32c.c
@@ -1,5 +1,5 @@
 /* BFD support for the M16C/M32C processors.
-   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -22,6 +22,19 @@
 #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[] =
 {
   {
@@ -35,7 +48,8 @@ static const bfd_arch_info_type arch_info_struct[] =
     3,				/* section align power */
     FALSE,			/* the default ? */
     bfd_default_compatible,	/* architecture comparison fn */
-    bfd_default_scan,		/* string to architecture convert fn */
+    m32c_scan,			/* string to architecture convert fn */
+    bfd_arch_default_fill,	/* Default fill.  */
     NULL			/* next in list */
   },
 };
@@ -52,6 +66,7 @@ const bfd_arch_info_type bfd_m32c_arch =
   4,				/* Section align power.  */
   TRUE,				/* The default ?  */
   bfd_default_compatible,	/* Architecture comparison fn.  */
-  bfd_default_scan,		/* String to architecture convert fn.  */
+  m32c_scan,			/* String to architecture convert fn.  */
+  bfd_arch_default_fill,	/* Default fill.  */
   &arch_info_struct[0],		/* Next in list.  */
 };