X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-w65.c;h=0200d704c8227bfefbad85b1082b68566c6cb62d;hb=fd885f3a4d85dc33d794ca359ea91f31e3082717;hp=dea6305f530851e75ac5717aa0ed4beed650d4a8;hpb=d468a1499bb2a9a106b0ece9ef785328812813c0;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c
index dea6305f53..0200d704c8 100644
--- a/bfd/cpu-w65.c
+++ b/bfd/cpu-w65.c
@@ -1,67 +1,57 @@
 /* BFD library support routines for the WDC 65816 architecture.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright 1995, 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
-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 publiw65ed 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 publiw65ed 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 w65ould have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You w65ould 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 bfd_boolean scan_mach
+  PARAMS ((const struct bfd_arch_info *, const char *));
 
-int bfd_default_scan_num_mach();
-
-static boolean 
+static bfd_boolean
 scan_mach (info, string)
-     CONST struct bfd_arch_info *info;
-     CONST char *string;
+     const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
+     const char *string;
 {
-  if (strcmp(string,"w65") == 0) return true;
-  if (strcmp(string,"w65816") == 0) return true;
-  return false;
+  if (strcmp(string,"w65") == 0)
+    return TRUE;
+  if (strcmp(string,"w65816") == 0)
+    return TRUE;
+  return FALSE;
 }
 
-
-
-static bfd_arch_info_type arch_info_struct[] = 
-{ 
-  {
-    16,				/* 16 bits in a word */
-    24,				/* 24 bits in an address */
-    8,				/* 8 bits in a byte */
-    bfd_arch_w65,
-    0,				/* only 1 machine */
-    "w65",			/* arch_name  */
-    "w65",			/* printable name */
-    1,
-    true,			/* the default machine */
-    bfd_default_compatible,
-    scan_mach,
-    0,
-    0,
-  },
-};
-
-
-
-void
-bfd_w65_arch ()
+const bfd_arch_info_type bfd_w65_arch =
 {
-  bfd_arch_linkin(&arch_info_struct[0]);
-}
-
-
+  16,				/* 16 bits in a word */
+  24,				/* 24 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_w65,
+  0,				/* only 1 machine */
+  "w65",			/* arch_name  */
+  "w65",			/* printable name */
+  1,
+  TRUE,				/* the default machine */
+  bfd_default_compatible,
+  scan_mach,
+  bfd_arch_default_fill,
+  0,
+};