X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-v850.c;h=0daea285ef9678ca789bf71b9c001fd9dc9cfe5f;hb=e379e5f385f874adb0b414f917adb1fc50e20de9;hp=084b08959bfaa2e5ccb7553e8eceb10e53b06d7c;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index 084b08959b..0daea285ef 100644
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -1,104 +1,41 @@
 /* BFD support for the NEC V850 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
-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"
-
-static boolean 
-scan (info, string)
-     const struct bfd_arch_info * info;
-     const char * string;
-{
-  const char *ptr_src;
-  const char *ptr_tst;
-  unsigned long number;
-  enum bfd_architecture arch;
-
-  /* First test for an exact match */
-  if (strcasecmp (string, info->printable_name) == 0)
-    return true;
-
-  /* See how much of the supplied string matches with the
-     architecture, eg the string m68k:68020 would match the m68k entry
-     up to the :, then we get left with the machine number */
-
-  for (ptr_src = string, ptr_tst = info->arch_name; 
-       *ptr_src && *ptr_tst;
-       ptr_src++, ptr_tst++) 
-    {
-      if (*ptr_src != *ptr_tst) break;
-    }
-
-  /* Chewed up as much of the architecture as will match, skip any
-     colons */
-  if (*ptr_src == ':')
-    ptr_src++;
-  
-  if (*ptr_src == 0)
-    {
-      /* nothing more, then only keep this one if it is the default
-	 machine for this architecture */
-      return info->the_default;
-    }
-
-  number = 0;
-  while (isdigit (*ptr_src))
-    {
-      number = number * 10 + * ptr_src  - '0';
-      ptr_src++;
-    }
-
-  switch (number) 
-    {
-/* start-sanitize-v850e */
-    case bfd_mach_v850e:  arch = bfd_arch_v850; break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-    case bfd_mach_v850eq: arch = bfd_arch_v850; break;
-/* end-sanitize-v850eq */
-
-    default:  
-      return false;
-    }
-
-  if (arch != info->arch) 
-    return false;
-
-  if (number != info->mach)
-    return false;
-
-  return true;
-}
+#include "safe-ctype.h"
 
 #define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, bfd_default_compatible, scan, next }
+ { 32, 32, 8, bfd_arch_v850, number, "v850", print ":old-gcc-abi", 2, default, \
+   bfd_default_compatible, bfd_default_scan, bfd_arch_default_fill, next, 0 }
 
-static const bfd_arch_info_type arch_info_struct[2] = 
+static const bfd_arch_info_type arch_info_struct[6] =
 {
-/* start-sanitize-v850e */
-  N( bfd_mach_v850e, "v850e", false, & arch_info_struct[1] ),
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-  N( bfd_mach_v850eq, "v850eq", false, NULL ),
-/* end-sanitize-v850eq */
+  N (bfd_mach_v850e3v5, "v850e3v5", FALSE, arch_info_struct + 1),
+  N (bfd_mach_v850e3v5, "v850e2v4", FALSE, arch_info_struct + 2),
+  N (bfd_mach_v850e2v3, "v850e2v3", FALSE, arch_info_struct + 3),
+  N (bfd_mach_v850e2,	"v850e2",   FALSE, arch_info_struct + 4),
+  N (bfd_mach_v850e1,	"v850e1",   FALSE, arch_info_struct + 5),
+  N (bfd_mach_v850e,	"v850e",    FALSE, NULL)
 };
 
 const bfd_arch_info_type bfd_v850_arch =
-  N( bfd_mach_v850, "v850", true, & arch_info_struct[0] );
+  N (bfd_mach_v850,     "v850",     TRUE,  arch_info_struct + 0);