Merge branch 'master' of git://github.com/monaka/binutils

[pf3gnuchains/pf3gnuchains3x.git] / bfd / cpu-v850.c

diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index 38333c8..77ca519 100644 (file)
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -1,11 +1,12 @@
 /* BFD support for the NEC V850 processor
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
 
    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
+   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,
@@ -15,10 +16,11 @@
 
    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"
+#include "bfd.h"
 #include "libbfd.h"
 #include "safe-ctype.h"
 
@@ -30,11 +32,12 @@
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (bfd_mach_v850e,  "v850e",  false, NULL)
+  N (bfd_mach_v850e1, "v850e1", FALSE, & arch_info_struct[1]),
+  N (bfd_mach_v850e,  "v850e",  FALSE, NULL)
 };
 
 #undef  NEXT
 #define NEXT & arch_info_struct[0]
 
 const bfd_arch_info_type bfd_v850_arch =
-  N (bfd_mach_v850, "v850", true, NEXT);
+  N (bfd_mach_v850, "v850", TRUE, NEXT);