X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-arc.c;h=5acfc1c1c95187447f581a97a66fe4042c282c5a;hb=fd885f3a4d85dc33d794ca359ea91f31e3082717;hp=b7e9a7cd732200f8c787cd0d909b24a7bb3a6b77;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
index b7e9a7cd73..5acfc1c1c9 100644
--- a/bfd/cpu-arc.c
+++ b/bfd/cpu-arc.c
@@ -1,77 +1,73 @@
 /* BFD support for the ARC processor
-   Copyright 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.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,					\
+    bfd_arch_default_fill,		\
+    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]);
-}
-
 /* 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;
 }