X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-w65.c;h=9a31772de48b8ad1083eba42f4ef682b8a4f7df4;hb=87f8eb977e936160d4c332d88a8bce3db690521c;hp=dea6305f530851e75ac5717aa0ed4beed650d4a8;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c
index dea6305f53..9a31772de4 100644
--- a/bfd/cpu-w65.c
+++ b/bfd/cpu-w65.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the WDC 65816 architecture.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1999 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,52 +16,36 @@ 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 
-
 int bfd_default_scan_num_mach();
 
-static boolean 
+static 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;
 }
 
-
-
-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,
+  0,
+};