Credit Jason Molenda as part of last ChangeLog entry.

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

diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index b7e9a7cd732200f8c787cd0d909b24a7bb3a6b77..c69df0e715cef7115c703d39aed9a4fc65bd99ec 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 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.
@@ -22,56 +22,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-#define ARC(mach, print_name, default_p) \
+#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,                  \
-    0,                                 \
+    next,                              \
   }
 
-static bfd_arch_info_type arch_info_struct[] =
+static const bfd_arch_info_type arch_info_struct[] =
 {
-  ARC (bfd_mach_arc_base, "arc-base", true),
-  ARC (bfd_mach_arc_host, "arc-host", false),
-  ARC (bfd_mach_arc_graphics, "arc-graphics", false),
-  ARC (bfd_mach_arc_audio, "arc-audio", false),
+  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 ),
 };
 
-void
-bfd_arc_arch ()
-{
-  register unsigned int i;
+const bfd_arch_info_type bfd_arc_arch =
+  ARC ( bfd_mach_arc_6, "arc", TRUE, &arch_info_struct[0] );
 
-  for (i = 0; i < sizeof (arch_info_struct) / sizeof (arch_info_struct[0]); i++)
-    bfd_arch_linkin (&arch_info_struct[i]);
-}
-\f
 /* Utility routines.  */
 
 /* Given cpu type NAME, return its bfd_mach_arc_xxx value.
-   NAME is one of "base, audio, etc.".
    Returns -1 if not found.  */
 
+int arc_get_mach PARAMS ((char *));
+
 int
 arc_get_mach (name)
      char *name;
 {
-  register unsigned int i;
+  const bfd_arch_info_type *p;
 
-  for (i = 0; i < sizeof (arch_info_struct) / sizeof (arch_info_struct[0]); i++)
-    {
-      /* +4: skip over "arc-" */
-      if (strcmp (name, arch_info_struct[i].printable_name + 4) == 0)
-       return arch_info_struct[i].mach;
-    }
+  for (p = &bfd_arc_arch; p != NULL; p = p->next)
+    if (strcmp (name, p->printable_name) == 0)
+      return p->mach;
   return -1;
 }