bfd/

[deliverable/binutils-gdb.git] / bfd / cpu-arc.c

diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index bce59d4c99f351601776facdb3ab9d8c5e5d1ce5..ef97da0eda2e26d09a1e4af9a3b7092cd92c28fc 100644 (file)
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -1,5 +1,5 @@
 /* BFD support for the ARC processor
-   Copyright 1994, 1995, 1997 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -24,36 +24,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define ARC(mach, print_name, default_p, next) \
 {                                      \
-    32,        /* 32 bits in a word */         \
-    32,        /* 32 bits in an address */     \
-    8, /* 8 bits in a byte */          \
+    32,        /* 32 bits in a word  */        \
+    32,        /* 32 bits in an address  */    \
+    8, /* 8 bits in a byte  */         \
     bfd_arch_arc,                      \
     mach,                              \
     "arc",                             \
     print_name,                                \
-    4, /* section alignment power */   \
+    4, /* section alignment power  */  \
     default_p,                         \
-    bfd_default_compatible,            \
+    bfd_default_compatible,            \
     bfd_default_scan,                  \
     next,                              \
   }
 
-#if 0 /* ??? Not currently needed, but keep in for future reference.  */
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  ARC (bfd_mach_arc_foo, "arc-foo", false, &arch_info_struct[1]),
-  ARC (bfd_mach_arc_bar, "arc-bar", false, 0),
+  ARC ( bfd_mach_arc_5, "arc5", FALSE, &arch_info_struct[1] ),
+  ARC ( bfd_mach_arc_5, "base", FALSE, &arch_info_struct[2] ),
+  ARC ( bfd_mach_arc_6, "arc6", FALSE, &arch_info_struct[3] ),
+  ARC ( bfd_mach_arc_7, "arc7", FALSE, &arch_info_struct[4] ),
+  ARC ( bfd_mach_arc_8, "arc8", FALSE, NULL ),
 };
-#endif
 
 const bfd_arch_info_type bfd_arc_arch =
-  ARC (bfd_mach_arc_base, "arc-base", true, 0 /*&arch_info_struct[0]*/);
-\f
+  ARC ( bfd_mach_arc_6, "arc", TRUE, &arch_info_struct[0] );
+
 /* Utility routines.  */
 
 /* Given cpu type NAME, return its bfd_mach_arc_xxx value.
    Returns -1 if not found.  */
 
+int arc_get_mach PARAMS ((char *));
+
 int
 arc_get_mach (name)
      char *name;
@@ -61,10 +64,7 @@ arc_get_mach (name)
   const bfd_arch_info_type *p;
 
   for (p = &bfd_arc_arch; p != NULL; p = p->next)
-    {
-      /* +4: skip over "arc-" */
-      if (strcmp (name, p->printable_name + 4) == 0)
-       return p->mach;
-    }
+    if (strcmp (name, p->printable_name) == 0)
+      return p->mach;
   return -1;
 }