* elf32-mips.c (mips_elf_create_dynamic_relocation): Change

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

diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index d035bf3450b5fd49595c5ff919f708878ad14c00..539413de02232a292d7fed61cec26dfecabe083a 100644 (file)
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -1,5 +1,5 @@
 /* BFD support for the NEC V850 processor
-   Copyright 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
+#include <ctype.h>
+
 static boolean 
 scan (info, string)
      const struct bfd_arch_info * info;
@@ -59,7 +61,7 @@ scan (info, string)
     }
 
   number = 0;
-  while (isdigit (*ptr_src))
+  while (isdigit ((unsigned char) *ptr_src))
     {
       number = number * 10 + * ptr_src  - '0';
       ptr_src++;
@@ -68,8 +70,7 @@ scan (info, string)
   switch (number) 
     {
     case bfd_mach_v850e:  arch = bfd_arch_v850; break;
-    case bfd_mach_v850eq: arch = bfd_arch_v850; break;
-
+    case bfd_mach_v850ea: arch = bfd_arch_v850; break;
     default:  
       return false;
     }
@@ -83,55 +84,20 @@ scan (info, string)
   return true;
 }
 
+#define N(number, print, default, next)  \
+{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
+     bfd_default_compatible, scan, next }
 
-static const bfd_arch_info_type arch_info_struct[2] = 
+#define NEXT NULL
+
+static const bfd_arch_info_type arch_info_struct[] = 
 {
-/* start-sanitize-v850e */
-  {
-    32,        /* 32 bits in a word */
-    32,        /* 32 bits in an address */
-    8, /* 8 bits in a byte */
-    bfd_arch_v850,
-    bfd_mach_v850e,
-    "v850",
-    "v850e",
-    2,
-    false,
-    bfd_default_compatible, 
-    scan,
-    & arch_info_struct[ 1 ],
-  },
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-  {
-    32,        /* 32 bits in a word */
-    32,        /* 32 bits in an address */
-    8, /* 8 bits in a byte */
-    bfd_arch_v850,
-    bfd_mach_v850eq,
-    "v850",
-    "v850eq",
-    2,
-    false,
-    bfd_default_compatible, 
-    scan,
-    0,
-  }
-/* end-sanitize-v850eq */
+  N (bfd_mach_v850e,  "v850e",  false, &arch_info_struct[1]),
+  N (bfd_mach_v850ea, "v850ea", false, NULL)
 };
 
+#undef NEXT
+#define NEXT &arch_info_struct[0]
+
 const bfd_arch_info_type bfd_v850_arch =
-  {
-    32, /* 32 bits in a word */
-    32, /* 32 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_v850,
-    bfd_mach_v850,
-    "v850",
-    "v850",
-    2,
-    true, /* the default */
-    bfd_default_compatible,
-    scan ,
-    & arch_info_struct[ 0 ],
-  };
+  N (bfd_mach_v850, "v850", true, NEXT);