Comings and goings of Mac-specific files.

[binutils.git] / bfd / cpu-rce.c

diff --git a/bfd/cpu-rce.c b/bfd/cpu-rce.c
index 3300b0a0a9fc6d3f365ff42ab10ccb0c6121cc7e..ab2e2160798671460a00818ed6d1ba916d0ecb47 100644 (file)
--- a/bfd/cpu-rce.c
+++ b/bfd/cpu-rce.c
@@ -1,4 +1,4 @@
-/* BFD library support routines for the Experiment SOP architecture.
+/* BFD library support routines for the Experiment RCE architecture.
    Copyright (C) 1993 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -15,7 +15,7 @@ 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., 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"
@@ -25,12 +25,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 int bfd_default_scan_num_mach();
 
 static boolean 
-DEFUN(scan_mach,(info, string),
-CONST struct bfd_arch_info *info AND
-CONST char *string)
+scan_mach (info, string)
+     const struct bfd_arch_info *info;
+     const char *string;
 {
-  if (strcmp(string,"sop") == 0) return true;
-  if (strcmp(string,"SOP") == 0) return true;
+  if (strcmp(string,"rce") == 0) return true;
+  if (strcmp(string,"RCE") == 0) return true;
   return false;
 }
 
@@ -39,10 +39,10 @@ CONST char *string)
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
 
-static CONST bfd_arch_info_type *
+static const bfd_arch_info_type *
 DEFUN(compatible,(a,b),
-      CONST bfd_arch_info_type *a AND
-      CONST bfd_arch_info_type *b)
+      const bfd_arch_info_type *a AND
+      const bfd_arch_info_type *b)
 {
   if (a->arch != b->arch || a->mach != b->mach)
    return NULL;
@@ -50,30 +50,18 @@ DEFUN(compatible,(a,b),
 }
 #endif
 
-static bfd_arch_info_type arch_info_struct[] = 
-{ 
-  {
-    32,                                /* 32 bits in a word */
-    32,                                /* 32 bits in an address */
-    8,                         /* 8 bits in a byte */
-    bfd_arch_rce,
-    0,                         /* only 1 machine */
-    "SOP",                     /* arch_name  */
-    "SOP",                     /* printable name */
-    1,
-    true,                      /* the default machine */
-    bfd_default_compatible,
-    scan_mach,
-    0,
-    0,
-  },
-};
-
-
-
-void
-DEFUN_VOID(bfd_sop_arch)
+const bfd_arch_info_type bfd_rce_arch =
 {
-  bfd_arch_linkin(&arch_info_struct[0]);
-}
-
+  32,                          /* 32 bits in a word */
+  32,                          /* 32 bits in an address */
+  8,                           /* 8 bits in a byte */
+  bfd_arch_rce,
+  0,                           /* only 1 machine */
+  "RCE",                       /* arch_name  */
+  "RCE",                       /* printable name */
+  1,
+  true,                                /* the default machine */
+  bfd_default_compatible,
+  scan_mach,
+  0,
+};