Add changes from customer since last work.

5 files changed, 29 insertions, 12 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index c5a8fe4..c5f1dae 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -263,7 +263,7 @@ else
 	done
 fi
 
-rce_files="ChangeLog archures.c bfd-in2.h config.bfd configure.in targets.c"
+rce_files="ChangeLog archures.c bfd-in2.h config.bfd configure.in targets.c aoutx.h libaout.h"
 if ( echo $* | grep keep\-rce > /dev/null ) ; then
 	for i in $rce_files ; do
 		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
diff --git a/bfd/archures.c b/bfd/archures.c
index ea4586d..a748437 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -111,6 +111,9 @@ DESCRIPTION
 .  bfd_arch_alpha,     {* Dec Alpha *}
 .  bfd_arch_arm,       {* Advanced Risc Machines ARM *}
 .  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
+.  start-sanitize-rce
+.  bfd_arch_rce,        {* Motorola RCE *}
+.  end-sanitize-rce
 .  bfd_arch_last
 .  };
 
diff --git a/bfd/configure.in b/bfd/configure.in
index ab3ef94..b8c8940 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -203,7 +203,7 @@ do
     rs6000coff_vec)		tb="$tb coff-rs6000.o" ;;
     shcoff_vec)			tb="$tb coff-sh.o cofflink.o" ;;
 # start-sanitize-rce
-    rce_aout_vec)		tb="$tb aout32.o reloc16.o" ;;
+    rce_aout_vec)		tb="$tb aout-rce.o aout32.o stab-syms.o" ;;
 # end-sanitize-rce
     shlcoff_vec)		tb="$tb coff-sh.o cofflink.o" ;;
     som_vec)			tb="$tb som.o" ;;
diff --git a/bfd/cpu-rce.c b/bfd/cpu-rce.c
index 57b44ba..12b752a 100644
--- 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.
@@ -29,8 +29,8 @@ DEFUN(scan_mach,(info, string),
 CONST struct bfd_arch_info *info AND
 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;
 }
 
@@ -58,8 +58,8 @@ static bfd_arch_info_type arch_info_struct[] =
     8,				/* 8 bits in a byte */
     bfd_arch_rce,
     0,				/* only 1 machine */
-    "SOP",			/* arch_name  */
-    "SOP",			/* printable name */
+    "RCE",			/* arch_name  */
+    "RCE",			/* printable name */
     1,
     true,			/* the default machine */
     bfd_default_compatible,
@@ -76,4 +76,3 @@ DEFUN_VOID(bfd_rce_arch)
 {
   bfd_arch_linkin(&arch_info_struct[0]);
 }
-
diff --git a/bfd/libaout.h b/bfd/libaout.h
index fc4e3c5..a40f3c0 100644
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -203,15 +203,26 @@ enum machine_type {
   M_68020 = 2,
   M_SPARC = 3,
   /* skip a bunch so we don't run into any of suns numbers */
+  /* make these up for the ns32k*/
+  M_NS32032 = (64),		/* ns32032 running ? */
+  M_NS32532 = (64 + 5),		/* ns32532 running mach */
+
   M_386 = 100,
   M_29K = 101,          /* AMD 29000 */
   M_386_DYNIX = 102,	/* Sequent running dynix */
-  M_386_NETBSD = 134,		/* NetBSD/386 binary */
+  M_ARM = 103,		/* Advanced Risc Machines ARM */
+  M_386_NETBSD = 134,	/* NetBSD/i386 binary */
+  M_68K_NETBSD = 135,	/* NetBSD/m68k binary */
+  M_532_NETBSD = 137,	/* NetBSD/ns32k binary */
+  M_SPARC_NETBSD = 138,	/* NetBSD/sparc binary */
   M_MIPS1 = 151,        /* MIPS R2000/R3000 binary */
   M_MIPS2 = 152,        /* MIPS R4000/R6000 binary */
   M_HP200 = 200,	/* HP 200 (68010) BSD binary */
   M_HP300 = (300 % 256), /* HP 300 (68020+68881) BSD binary */
   M_HPUX = (0x20c % 256)/* HP 200/300 HPUX binary */
+/* start-sanitize-rce */
+  M_RCE = 155,		/* Motorola RCE binary */
+/* end-sanitize-rce */
 };
 
 #define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)
@@ -295,6 +306,10 @@ struct aoutdata {
   /* Segment size - needed for alignment of demand paged files. */
   unsigned long segment_size;
 
+  /* Zmagic disk block size - need to align the start of the text
+     section in ZMAGIC binaries.  Normally the same as page_size.  */
+  unsigned long zmagic_disk_block_size;
+
   unsigned exec_bytes_size;
   unsigned vma_adjusted : 1;
 
@@ -374,10 +389,10 @@ NAME(aout,squirt_out_relocs) PARAMS ((bfd *abfd, asection *section));
 boolean
 NAME(aout,make_sections) PARAMS ((bfd *));
 
-bfd_target *
+const bfd_target *
 NAME(aout,some_aout_object_p) PARAMS ((bfd *abfd,
-			struct internal_exec *execp,
-			bfd_target * (*callback)(bfd *)));
+				       struct internal_exec *execp,
+				       const bfd_target *(*callback)(bfd *)));
 
 boolean
 NAME(aout,mkobject) PARAMS ((bfd *abfd));