Convert to ISO C90 formatting

1 files changed, 1675 insertions, 1843 deletions

diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 9bea98ea066..f08171c9b3a 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -129,20 +129,7 @@ DESCRIPTION
 #include "aout/stab_gnu.h"
 #include "aout/ar.h"
 
-static bfd_boolean aout_get_external_symbols
-  PARAMS ((bfd *));
-static bfd_boolean translate_from_native_sym_flags
-  PARAMS ((bfd *, aout_symbol_type *));
-static bfd_boolean translate_to_native_sym_flags
-  PARAMS ((bfd *, asymbol *, struct external_nlist *));
-static void adjust_o_magic
-  PARAMS ((bfd *, struct internal_exec *));
-static void adjust_z_magic
-  PARAMS ((bfd *, struct internal_exec *));
-static void adjust_n_magic
-  PARAMS ((bfd *, struct internal_exec *));
-reloc_howto_type * NAME(aout,reloc_type_lookup)
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
+reloc_howto_type * NAME (aout, reloc_type_lookup)  (bfd *, bfd_reloc_code_real_type);
 
 /*
 SUBSECTION
@@ -166,19 +153,19 @@ DESCRIPTION
 #endif
 
 #ifndef MY_swap_std_reloc_in
-#define MY_swap_std_reloc_in NAME(aout,swap_std_reloc_in)
+#define MY_swap_std_reloc_in NAME (aout, swap_std_reloc_in)
 #endif
 
 #ifndef MY_swap_ext_reloc_in
-#define MY_swap_ext_reloc_in NAME(aout,swap_ext_reloc_in)
+#define MY_swap_ext_reloc_in NAME (aout, swap_ext_reloc_in)
 #endif
 
 #ifndef MY_swap_std_reloc_out
-#define MY_swap_std_reloc_out NAME(aout,swap_std_reloc_out)
+#define MY_swap_std_reloc_out NAME (aout, swap_std_reloc_out)
 #endif
 
 #ifndef MY_swap_ext_reloc_out
-#define MY_swap_ext_reloc_out NAME(aout,swap_ext_reloc_out)
+#define MY_swap_ext_reloc_out NAME (aout, swap_ext_reloc_out)
 #endif
 
 #ifndef MY_final_link_relocate
@@ -189,40 +176,40 @@ DESCRIPTION
 #define MY_relocate_contents _bfd_relocate_contents
 #endif
 
-#define howto_table_ext NAME(aout,ext_howto_table)
-#define howto_table_std NAME(aout,std_howto_table)
+#define howto_table_ext NAME (aout, ext_howto_table)
+#define howto_table_std NAME (aout, std_howto_table)
 
 reloc_howto_type howto_table_ext[] =
 {
-  /* type           rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone.  */
-  HOWTO(RELOC_8,      0,  0,  	8,  FALSE, 0, complain_overflow_bitfield,0,"8",        FALSE, 0,0x000000ff, FALSE),
-  HOWTO(RELOC_16,     0,  1, 	16, FALSE, 0, complain_overflow_bitfield,0,"16",       FALSE, 0,0x0000ffff, FALSE),
-  HOWTO(RELOC_32,     0,  2, 	32, FALSE, 0, complain_overflow_bitfield,0,"32",       FALSE, 0,0xffffffff, FALSE),
-  HOWTO(RELOC_DISP8,  0,  0, 	8,  TRUE,  0, complain_overflow_signed,0,"DISP8", 	FALSE, 0,0x000000ff, FALSE),
-  HOWTO(RELOC_DISP16, 0,  1, 	16, TRUE,  0, complain_overflow_signed,0,"DISP16", 	FALSE, 0,0x0000ffff, FALSE),
-  HOWTO(RELOC_DISP32, 0,  2, 	32, TRUE,  0, complain_overflow_signed,0,"DISP32", 	FALSE, 0,0xffffffff, FALSE),
-  HOWTO(RELOC_WDISP30,2,  2, 	30, TRUE,  0, complain_overflow_signed,0,"WDISP30", 	FALSE, 0,0x3fffffff, FALSE),
-  HOWTO(RELOC_WDISP22,2,  2, 	22, TRUE,  0, complain_overflow_signed,0,"WDISP22", 	FALSE, 0,0x003fffff, FALSE),
-  HOWTO(RELOC_HI22,   10, 2, 	22, FALSE, 0, complain_overflow_bitfield,0,"HI22",	FALSE, 0,0x003fffff, FALSE),
-  HOWTO(RELOC_22,     0,  2, 	22, FALSE, 0, complain_overflow_bitfield,0,"22",       FALSE, 0,0x003fffff, FALSE),
-  HOWTO(RELOC_13,     0,  2, 	13, FALSE, 0, complain_overflow_bitfield,0,"13",       FALSE, 0,0x00001fff, FALSE),
-  HOWTO(RELOC_LO10,   0,  2, 	10, FALSE, 0, complain_overflow_dont,0,"LO10",     FALSE, 0,0x000003ff, FALSE),
-  HOWTO(RELOC_SFA_BASE,0, 2, 	32, FALSE, 0, complain_overflow_bitfield,0,"SFA_BASE", FALSE, 0,0xffffffff, FALSE),
-  HOWTO(RELOC_SFA_OFF13,0,2, 	32, FALSE, 0, complain_overflow_bitfield,0,"SFA_OFF13",FALSE, 0,0xffffffff, FALSE),
-  HOWTO(RELOC_BASE10, 0,  2, 	10, FALSE, 0, complain_overflow_dont,0,"BASE10",   FALSE, 0,0x000003ff, FALSE),
-  HOWTO(RELOC_BASE13, 0,  2,	13, FALSE, 0, complain_overflow_signed,0,"BASE13",   FALSE, 0,0x00001fff, FALSE),
-  HOWTO(RELOC_BASE22, 10, 2,	22, FALSE, 0, complain_overflow_bitfield,0,"BASE22",   FALSE, 0,0x003fffff, FALSE),
-  HOWTO(RELOC_PC10,   0,  2,	10, TRUE,  0, complain_overflow_dont,0,"PC10",	FALSE, 0,0x000003ff, TRUE),
-  HOWTO(RELOC_PC22,   10,  2,	22, TRUE,  0, complain_overflow_signed,0,"PC22", FALSE, 0,0x003fffff, TRUE),
-  HOWTO(RELOC_JMP_TBL,2,  2, 	30, TRUE,  0, complain_overflow_signed,0,"JMP_TBL", 	FALSE, 0,0x3fffffff, FALSE),
-  HOWTO(RELOC_SEGOFF16,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"SEGOFF16",	FALSE, 0,0x00000000, FALSE),
-  HOWTO(RELOC_GLOB_DAT,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"GLOB_DAT",	FALSE, 0,0x00000000, FALSE),
-  HOWTO(RELOC_JMP_SLOT,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"JMP_SLOT",	FALSE, 0,0x00000000, FALSE),
-  HOWTO(RELOC_RELATIVE,0, 2,	0,  FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",	FALSE, 0,0x00000000, FALSE),
-  HOWTO(0,  0, 0,    0,  FALSE, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
-  HOWTO(0,  0, 0,    0,  FALSE, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  /*     Type         rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone.  */
+  HOWTO (RELOC_8,       0,  0,  8,  FALSE, 0, complain_overflow_bitfield, 0, "8",           FALSE, 0, 0x000000ff, FALSE),
+  HOWTO (RELOC_16,      0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",          FALSE, 0, 0x0000ffff, FALSE),
+  HOWTO (RELOC_32,      0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",          FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_DISP8,   0,  0, 	8,  TRUE,  0, complain_overflow_signed,   0, "DISP8", 	    FALSE, 0, 0x000000ff, FALSE),
+  HOWTO (RELOC_DISP16,  0,  1, 	16, TRUE,  0, complain_overflow_signed,   0, "DISP16", 	    FALSE, 0, 0x0000ffff, FALSE),
+  HOWTO (RELOC_DISP32,  0,  2, 	32, TRUE,  0, complain_overflow_signed,   0, "DISP32", 	    FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_WDISP30, 2,  2, 	30, TRUE,  0, complain_overflow_signed,   0, "WDISP30",     FALSE, 0, 0x3fffffff, FALSE),
+  HOWTO (RELOC_WDISP22, 2,  2, 	22, TRUE,  0, complain_overflow_signed,   0, "WDISP22",     FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_HI22,   10,  2, 	22, FALSE, 0, complain_overflow_bitfield, 0, "HI22",	    FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_22,      0,  2, 	22, FALSE, 0, complain_overflow_bitfield, 0, "22",          FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_13,      0,  2, 	13, FALSE, 0, complain_overflow_bitfield, 0, "13",          FALSE, 0, 0x00001fff, FALSE),
+  HOWTO (RELOC_LO10,    0,  2, 	10, FALSE, 0, complain_overflow_dont,     0, "LO10",        FALSE, 0, 0x000003ff, FALSE),
+  HOWTO (RELOC_SFA_BASE,0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "SFA_BASE",    FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_SFA_OFF13,0, 2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "SFA_OFF13",   FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_BASE10,  0,  2, 	10, FALSE, 0, complain_overflow_dont,     0, "BASE10",      FALSE, 0, 0x000003ff, FALSE),
+  HOWTO (RELOC_BASE13,  0,  2,	13, FALSE, 0, complain_overflow_signed,   0, "BASE13",      FALSE, 0, 0x00001fff, FALSE),
+  HOWTO (RELOC_BASE22, 10,  2,	22, FALSE, 0, complain_overflow_bitfield, 0, "BASE22",      FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_PC10,    0,  2,	10, TRUE,  0, complain_overflow_dont,     0, "PC10",	    FALSE, 0, 0x000003ff, TRUE),
+  HOWTO (RELOC_PC22,   10,  2,	22, TRUE,  0, complain_overflow_signed,   0, "PC22",  	    FALSE, 0, 0x003fffff, TRUE),
+  HOWTO (RELOC_JMP_TBL, 2,  2, 	30, TRUE,  0, complain_overflow_signed,   0, "JMP_TBL",     FALSE, 0, 0x3fffffff, FALSE),
+  HOWTO (RELOC_SEGOFF16,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "SEGOFF16",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_GLOB_DAT,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "GLOB_DAT",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_JMP_SLOT,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "JMP_SLOT",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_RELATIVE,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "RELATIVE",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (0,             0,  0,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
+  HOWTO (0,             0,  0,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
 #define RELOC_SPARC_REV32 RELOC_WDISP19
-  HOWTO(RELOC_SPARC_REV32,    0,  2, 	32, FALSE, 0, complain_overflow_dont,0,"R_SPARC_REV32",       FALSE, 0,0xffffffff, FALSE),
+  HOWTO (RELOC_SPARC_REV32, 0, 2, 32, FALSE, 0, complain_overflow_dont,   0,"R_SPARC_REV32",FALSE, 0, 0xffffffff, FALSE),
 };
 
 /* Convert standard reloc records to "arelent" format (incl byte swap).  */
@@ -276,12 +263,10 @@ EMPTY_HOWTO (-1),
 #define TABLE_SIZE(TABLE)	(sizeof (TABLE) / sizeof (TABLE[0]))
 
 reloc_howto_type *
-NAME(aout,reloc_type_lookup) (abfd,code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
+NAME (aout, reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code)
 {
-#define EXT(i, j)	case i: return &howto_table_ext[j]
-#define STD(i, j)	case i: return &howto_table_std[j]
+#define EXT(i, j)	case i: return & howto_table_ext [j]
+#define STD(i, j)	case i: return & howto_table_std [j]
   int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
 
   if (code == BFD_RELOC_CTOR)
@@ -314,7 +299,8 @@ NAME(aout,reloc_type_lookup) (abfd,code)
 	EXT (BFD_RELOC_SPARC_PC22, 18);
 	EXT (BFD_RELOC_SPARC_WPLT30, 19);
 	EXT (BFD_RELOC_SPARC_REV32, 26);
-      default: return (reloc_howto_type *) NULL;
+      default:
+	return NULL;
       }
   else
     /* std relocs.  */
@@ -328,7 +314,8 @@ NAME(aout,reloc_type_lookup) (abfd,code)
 	STD (BFD_RELOC_32_PCREL, 6);
 	STD (BFD_RELOC_16_BASEREL, 9);
 	STD (BFD_RELOC_32_BASEREL, 10);
-      default: return (reloc_howto_type *) NULL;
+      default:
+	return NULL;
       }
 }
 
@@ -340,7 +327,6 @@ DESCRIPTION
 	@file{aoutx.h} exports several routines for accessing the
 	contents of an a.out file, which are gathered and exported in
 	turn by various format specific files (eg sunos.c).
-
 */
 
 /*
@@ -350,7 +336,7 @@ FUNCTION
 SYNOPSIS
 	void aout_@var{size}_swap_exec_header_in,
            (bfd *abfd,
-            struct external_exec *raw_bytes,
+            struct external_exec *bytes,
             struct internal_exec *execp);
 
 DESCRIPTION
@@ -361,18 +347,15 @@ DESCRIPTION
 
 #ifndef NAME_swap_exec_header_in
 void
-NAME(aout,swap_exec_header_in) (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
+NAME (aout, swap_exec_header_in) (bfd *abfd,
+				  struct external_exec *bytes,
+				  struct internal_exec *execp)
 {
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
   /* The internal_exec structure has some fields that are unused in this
      configuration (IE for i960), so ensure that all such uninitialized
      fields are zero'd out.  There are places where two of these structs
      are memcmp'd, and thus the contents do matter.  */
-  memset ((PTR) execp, 0, sizeof (struct internal_exec));
+  memset ((void *) execp, 0, sizeof (struct internal_exec));
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
   execp->a_info   = H_GET_32 (abfd, bytes->e_info);
   execp->a_text   = GET_WORD (abfd, bytes->e_text);
@@ -383,7 +366,7 @@ NAME(aout,swap_exec_header_in) (abfd, raw_bytes, execp)
   execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
   execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
 }
-#define NAME_swap_exec_header_in NAME(aout,swap_exec_header_in)
+#define NAME_swap_exec_header_in NAME (aout, swap_exec_header_in)
 #endif
 
 /*
@@ -401,13 +384,10 @@ DESCRIPTION
 	@var{execp} into the buffer @var{raw_bytes} ready for writing to disk.
 */
 void
-NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     struct external_exec *raw_bytes;
+NAME (aout, swap_exec_header_out) (bfd *abfd,
+				   struct internal_exec *execp,
+				   struct external_exec *bytes)
 {
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
   /* Now fill in fields in the raw data, from the fields in the exec struct.  */
   H_PUT_32 (abfd, execp->a_info  , bytes->e_info);
   PUT_WORD (abfd, execp->a_text  , bytes->e_text);
@@ -422,17 +402,13 @@ NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes)
 /* Make all the section for an a.out file.  */
 
 bfd_boolean
-NAME(aout,make_sections) (abfd)
-     bfd *abfd;
+NAME (aout, make_sections) (bfd *abfd)
 {
-  if (obj_textsec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".text") == (asection *) NULL)
+  if (obj_textsec (abfd) == NULL && bfd_make_section (abfd, ".text") == NULL)
     return FALSE;
-  if (obj_datasec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".data") == (asection *) NULL)
+  if (obj_datasec (abfd) == NULL && bfd_make_section (abfd, ".data") == NULL)
     return FALSE;
-  if (obj_bsssec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".bss") == (asection *) NULL)
+  if (obj_bsssec (abfd) == NULL && bfd_make_section (abfd, ".bss") == NULL)
     return FALSE;
   return TRUE;
 }
@@ -444,7 +420,8 @@ FUNCTION
 SYNOPSIS
 	const bfd_target *aout_@var{size}_some_aout_object_p
 	 (bfd *abfd,
-	  const bfd_target *(*callback_to_real_object_p) ());
+          struct internal_exec *execp,
+	  const bfd_target *(*callback_to_real_object_p) (bfd *));
 
 DESCRIPTION
 	Some a.out variant thinks that the file open in @var{abfd}
@@ -455,18 +432,17 @@ DESCRIPTION
 */
 
 const bfd_target *
-NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p)
-     bfd *abfd;
-     struct internal_exec *execp;
-     const bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *));
+NAME (aout, some_aout_object_p) (bfd *abfd,
+				 struct internal_exec *execp,
+				 const bfd_target *(*callback_to_real_object_p) (bfd *))
 {
   struct aout_data_struct *rawptr, *oldrawptr;
   const bfd_target *result;
-  bfd_size_type amt = sizeof (struct aout_data_struct);
+  bfd_size_type amt = sizeof (* rawptr);
 
-  rawptr = (struct aout_data_struct  *) bfd_zalloc (abfd, amt);
+  rawptr = bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
-    return 0;
+    return NULL;
 
   oldrawptr = abfd->tdata.aout_data;
   abfd->tdata.aout_data = rawptr;
@@ -513,15 +489,13 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p)
 	   || N_MAGIC (*execp) == BMAGIC)
     adata (abfd).magic = o_magic;
   else
-    {
-      /* Should have been checked with N_BADMAG before this routine
-	 was called.  */
-      abort ();
-    }
+    /* Should have been checked with N_BADMAG before this routine
+       was called.  */
+    abort ();
 
   bfd_get_start_address (abfd) = execp->a_entry;
 
-  obj_aout_symbols (abfd) = (aout_symbol_type *)NULL;
+  obj_aout_symbols (abfd) = NULL;
   bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
 
   /* The default relocation entry size is that of traditional V7 Unix.  */
@@ -538,7 +512,7 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p)
   obj_aout_external_strings (abfd) = NULL;
   obj_aout_sym_hashes (abfd) = NULL;
 
-  if (! NAME(aout,make_sections) (abfd))
+  if (! NAME (aout, make_sections) (abfd))
     goto error_ret;
 
   obj_datasec (abfd)->size = execp->a_data;
@@ -674,24 +648,23 @@ DESCRIPTION
 */
 
 bfd_boolean
-NAME(aout,mkobject) (abfd)
-     bfd *abfd;
+NAME (aout, mkobject) (bfd *abfd)
 {
   struct aout_data_struct *rawptr;
-  bfd_size_type amt = sizeof (struct aout_data_struct);
+  bfd_size_type amt = sizeof (* rawptr);
 
   bfd_set_error (bfd_error_system_call);
 
-  rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
+  rawptr = bfd_zalloc (abfd, amt);
   if (rawptr == NULL)
     return FALSE;
 
   abfd->tdata.aout_data = rawptr;
   exec_hdr (abfd) = &(rawptr->e);
 
-  obj_textsec (abfd) = (asection *) NULL;
-  obj_datasec (abfd) = (asection *) NULL;
-  obj_bsssec (abfd) = (asection *) NULL;
+  obj_textsec (abfd) = NULL;
+  obj_datasec (abfd) = NULL;
+  obj_bsssec (abfd) = NULL;
 
   return TRUE;
 }
@@ -703,7 +676,8 @@ FUNCTION
 SYNOPSIS
 	enum machine_type  aout_@var{size}_machine_type
 	 (enum bfd_architecture arch,
-	  unsigned long machine));
+	  unsigned long machine,
+          bfd_boolean *unknown);
 
 DESCRIPTION
 	Keep track of machine architecture and machine type for
@@ -716,10 +690,9 @@ DESCRIPTION
 */
 
 enum machine_type
-NAME(aout,machine_type) (arch, machine, unknown)
-     enum bfd_architecture arch;
-     unsigned long machine;
-     bfd_boolean *unknown;
+NAME (aout, machine_type) (enum bfd_architecture arch,
+			   unsigned long machine,
+			   bfd_boolean *unknown)
 {
   enum machine_type arch_flags;
 
@@ -846,7 +819,7 @@ SYNOPSIS
 	bfd_boolean aout_@var{size}_set_arch_mach,
 	 (bfd *,
 	  enum bfd_architecture arch,
-	  unsigned long machine));
+	  unsigned long machine);
 
 DESCRIPTION
 	Set the architecture and the machine of the BFD @var{abfd} to the
@@ -855,10 +828,9 @@ DESCRIPTION
 */
 
 bfd_boolean
-NAME(aout,set_arch_mach) (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
+NAME (aout, set_arch_mach) (bfd *abfd,
+			    enum bfd_architecture arch,
+			    unsigned long machine)
 {
   if (! bfd_default_set_arch_mach (abfd, arch, machine))
     return FALSE;
@@ -867,7 +839,7 @@ NAME(aout,set_arch_mach) (abfd, arch, machine)
     {
       bfd_boolean unknown;
 
-      NAME(aout,machine_type) (arch, machine, &unknown);
+      NAME (aout, machine_type) (arch, machine, &unknown);
       if (unknown)
 	return FALSE;
     }
@@ -889,9 +861,7 @@ NAME(aout,set_arch_mach) (abfd, arch, machine)
 }
 
 static void
-adjust_o_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
+adjust_o_magic (bfd *abfd, struct internal_exec *execp)
 {
   file_ptr pos = adata (abfd).exec_bytes_size;
   bfd_vma vma = 0;
@@ -951,14 +921,13 @@ adjust_o_magic (abfd, execp)
 }
 
 static void
-adjust_z_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
+adjust_z_magic (bfd *abfd, struct internal_exec *execp)
 {
   bfd_size_type data_pad, text_pad;
   file_ptr text_end;
   const struct aout_backend_data *abdp;
-  int ztih;			/* Nonzero if text includes exec header.  */
+  /* TRUE if text includes exec header.  */
+  bfd_boolean ztih;
 
   abdp = aout_backend_info (abfd);
 
@@ -1069,9 +1038,7 @@ adjust_z_magic (abfd, execp)
 }
 
 static void
-adjust_n_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
+adjust_n_magic (bfd *abfd, struct internal_exec *execp)
 {
   file_ptr pos = adata (abfd).exec_bytes_size;
   bfd_vma vma = 0;
@@ -1112,14 +1079,13 @@ adjust_n_magic (abfd, execp)
 }
 
 bfd_boolean
-NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
-     bfd *abfd;
-     bfd_size_type *text_size;
-     file_ptr *text_end ATTRIBUTE_UNUSED;
+NAME (aout, adjust_sizes_and_vmas) (bfd *abfd,
+				    bfd_size_type *text_size,
+				    file_ptr *text_end ATTRIBUTE_UNUSED)
 {
   struct internal_exec *execp = exec_hdr (abfd);
 
-  if (! NAME(aout,make_sections) (abfd))
+  if (! NAME (aout, make_sections) (abfd))
     return FALSE;
 
   if (adata (abfd).magic != undecided_magic)
@@ -1210,16 +1176,14 @@ FUNCTION
 SYNOPSIS
         bfd_boolean aout_@var{size}_new_section_hook,
 	   (bfd *abfd,
-	    asection *newsect));
+	    asection *newsect);
 
 DESCRIPTION
 	Called by the BFD in response to a @code{bfd_make_section}
 	request.
 */
 bfd_boolean
-NAME(aout,new_section_hook) (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
+NAME (aout, new_section_hook) (bfd *abfd, asection *newsect)
 {
   /* Align to double at least.  */
   newsect->alignment_power = bfd_get_arch_info (abfd)->section_align_power;
@@ -1253,19 +1217,18 @@ NAME(aout,new_section_hook) (abfd, newsect)
 }
 
 bfd_boolean
-NAME(aout,set_section_contents) (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     const PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+NAME (aout, set_section_contents) (bfd *abfd,
+				   sec_ptr section,
+				   const void * location,
+				   file_ptr offset,
+				   bfd_size_type count)
 {
   file_ptr text_end;
   bfd_size_type text_size;
 
   if (! abfd->output_has_begun)
     {
-      if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+      if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
 	return FALSE;
     }
 
@@ -1304,10 +1267,9 @@ NAME(aout,set_section_contents) (abfd, section, location, offset, count)
 /* Read the external symbols from an a.out file.  */
 
 static bfd_boolean
-aout_get_external_symbols (abfd)
-     bfd *abfd;
+aout_get_external_symbols (bfd *abfd)
 {
-  if (obj_aout_external_syms (abfd) == (struct external_nlist *) NULL)
+  if (obj_aout_external_syms (abfd) == NULL)
     {
       bfd_size_type count;
       struct external_nlist *syms;
@@ -1325,9 +1287,8 @@ aout_get_external_symbols (abfd)
       /* We allocate using malloc to make the values easy to free
 	 later on.  If we put them on the objalloc it might not be
 	 possible to free them.  */
-      syms = ((struct external_nlist *)
-	      bfd_malloc (count * EXTERNAL_NLIST_SIZE));
-      if (syms == (struct external_nlist *) NULL && count != 0)
+      syms = bfd_malloc (count * EXTERNAL_NLIST_SIZE);
+      if (syms == NULL && count != 0)
 	return FALSE;
 
       amt = exec_hdr (abfd)->a_syms;
@@ -1353,7 +1314,7 @@ aout_get_external_symbols (abfd)
 
       /* Get the size of the strings.  */
       if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
-	  || bfd_bread ((PTR) string_chars, amt, abfd) != amt)
+	  || bfd_bread ((void *) string_chars, amt, abfd) != amt)
 	return FALSE;
       stringsize = GET_WORD (abfd, string_chars);
 
@@ -1363,7 +1324,7 @@ aout_get_external_symbols (abfd)
 	return FALSE;
       strings = (char *) obj_aout_string_window (abfd).data;
 #else
-      strings = (char *) bfd_malloc (stringsize + 1);
+      strings = bfd_malloc (stringsize + 1);
       if (strings == NULL)
 	return FALSE;
 
@@ -1395,9 +1356,7 @@ aout_get_external_symbols (abfd)
    symbol->flags and symbol->section, and adjusting symbol->value.  */
 
 static bfd_boolean
-translate_from_native_sym_flags (abfd, cache_ptr)
-     bfd *abfd;
-     aout_symbol_type *cache_ptr;
+translate_from_native_sym_flags (bfd *abfd, aout_symbol_type *cache_ptr)
 {
   flagword visible;
 
@@ -1568,10 +1527,9 @@ translate_from_native_sym_flags (abfd, cache_ptr)
 /* Set the fields of SYM_POINTER according to CACHE_PTR.  */
 
 static bfd_boolean
-translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
-     bfd *abfd;
-     asymbol *cache_ptr;
-     struct external_nlist *sym_pointer;
+translate_to_native_sym_flags (bfd *abfd,
+			       asymbol *cache_ptr,
+			       struct external_nlist *sym_pointer)
 {
   bfd_vma value = cache_ptr->value;
   asection *sec;
@@ -1681,11 +1639,11 @@ translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
 /* Native-level interface to symbols.  */
 
 asymbol *
-NAME(aout,make_empty_symbol) (abfd)
-     bfd *abfd;
+NAME (aout, make_empty_symbol) (bfd *abfd)
 {
   bfd_size_type amt = sizeof (aout_symbol_type);
-  aout_symbol_type *new = (aout_symbol_type *) bfd_zalloc (abfd, amt);
+
+  aout_symbol_type *new = bfd_zalloc (abfd, amt);
   if (!new)
     return NULL;
   new->symbol.the_bfd = abfd;
@@ -1696,14 +1654,13 @@ NAME(aout,make_empty_symbol) (abfd)
 /* Translate a set of internal symbols into external symbols.  */
 
 bfd_boolean
-NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
-     bfd *abfd;
-     aout_symbol_type *in;
-     struct external_nlist *ext;
-     bfd_size_type count;
-     char *str;
-     bfd_size_type strsize;
-     bfd_boolean dynamic;
+NAME (aout, translate_symbol_table) (bfd *abfd,
+				     aout_symbol_type *in,
+				     struct external_nlist *ext,
+				     bfd_size_type count,
+				     char *str,
+				     bfd_size_type strsize,
+				     bfd_boolean dynamic)
 {
   struct external_nlist *ext_end;
 
@@ -1748,15 +1705,14 @@ NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
    hold them all plus all the cached symbol entries.  */
 
 bfd_boolean
-NAME(aout,slurp_symbol_table) (abfd)
-     bfd *abfd;
+NAME (aout, slurp_symbol_table) (bfd *abfd)
 {
   struct external_nlist *old_external_syms;
   aout_symbol_type *cached;
   bfd_size_type cached_size;
 
   /* If there's no work to be done, don't do any.  */
-  if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
+  if (obj_aout_symbols (abfd) != NULL)
     return TRUE;
 
   old_external_syms = obj_aout_external_syms (abfd);
@@ -1766,12 +1722,12 @@ NAME(aout,slurp_symbol_table) (abfd)
 
   cached_size = obj_aout_external_sym_count (abfd);
   cached_size *= sizeof (aout_symbol_type);
-  cached = (aout_symbol_type *) bfd_zmalloc (cached_size);
+  cached = bfd_zmalloc (cached_size);
   if (cached == NULL && cached_size != 0)
     return FALSE;
 
   /* Convert from external symbol information to internal.  */
-  if (! (NAME(aout,translate_symbol_table)
+  if (! (NAME (aout, translate_symbol_table)
 	 (abfd, cached,
 	  obj_aout_external_syms (abfd),
 	  obj_aout_external_sym_count (abfd),
@@ -1791,8 +1747,8 @@ NAME(aout,slurp_symbol_table) (abfd)
      want the external symbol information, so if it was allocated
      because of our call to aout_get_external_symbols, we free it up
      right away to save space.  */
-  if (old_external_syms == (struct external_nlist *) NULL
-      && obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
+  if (old_external_syms == NULL
+      && obj_aout_external_syms (abfd) != NULL)
     {
 #ifdef USE_MMAP
       bfd_free_window (&obj_aout_sym_window (abfd));
@@ -1814,20 +1770,14 @@ NAME(aout,slurp_symbol_table) (abfd)
    This hash table code breaks dbx on SunOS 4.1.3, so we don't do it
    if BFD_TRADITIONAL_FORMAT is set.  */
 
-static bfd_size_type add_to_stringtab
-  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, bfd_boolean));
-static bfd_boolean emit_stringtab
-  PARAMS ((bfd *, struct bfd_strtab_hash *));
-
 /* Get the index of a string in a strtab, adding it if it is not
    already present.  */
 
-static INLINE bfd_size_type
-add_to_stringtab (abfd, tab, str, copy)
-     bfd *abfd;
-     struct bfd_strtab_hash *tab;
-     const char *str;
-     bfd_boolean copy;
+static inline bfd_size_type
+add_to_stringtab (bfd *abfd,
+		  struct bfd_strtab_hash *tab,
+		  const char *str,
+		  bfd_boolean copy)
 {
   bfd_boolean hash;
   bfd_size_type index;
@@ -1845,11 +1795,9 @@ add_to_stringtab (abfd, tab, str, copy)
   index = _bfd_stringtab_add (tab, str, hash, copy);
 
   if (index != (bfd_size_type) -1)
-    {
-      /* Add BYTES_IN_WORD to the return value to account for the
-	 space taken up by the string table size.  */
-      index += BYTES_IN_WORD;
-    }
+    /* Add BYTES_IN_WORD to the return value to account for the
+       space taken up by the string table size.  */
+    index += BYTES_IN_WORD;
 
   return index;
 }
@@ -1858,24 +1806,21 @@ add_to_stringtab (abfd, tab, str, copy)
    file.  */
 
 static bfd_boolean
-emit_stringtab (abfd, tab)
-     register bfd *abfd;
-     struct bfd_strtab_hash *tab;
+emit_stringtab (bfd *abfd, struct bfd_strtab_hash *tab)
 {
   bfd_byte buffer[BYTES_IN_WORD];
   bfd_size_type amt = BYTES_IN_WORD;
 
   /* The string table starts with the size.  */
   PUT_WORD (abfd, _bfd_stringtab_size (tab) + BYTES_IN_WORD, buffer);
-  if (bfd_bwrite ((PTR) buffer, amt, abfd) != amt)
+  if (bfd_bwrite ((void *) buffer, amt, abfd) != amt)
     return FALSE;
 
   return _bfd_stringtab_emit (abfd, tab);
 }
 
 bfd_boolean
-NAME(aout,write_syms) (abfd)
-     bfd *abfd;
+NAME (aout, write_syms) (bfd *abfd)
 {
   unsigned int count ;
   asymbol **generic = bfd_get_outsymbols (abfd);
@@ -1914,7 +1859,7 @@ NAME(aout,write_syms) (abfd)
 	goto error_return;
 
       amt = EXTERNAL_NLIST_SIZE;
-      if (bfd_bwrite ((PTR) &nsp, amt, abfd) != amt)
+      if (bfd_bwrite ((void *) &nsp, amt, abfd) != amt)
 	goto error_return;
 
       /* NB: `KEEPIT' currently overlays `udata.p', so set this only
@@ -1935,35 +1880,32 @@ error_return:
 }
 
 long
-NAME(aout,canonicalize_symtab) (abfd, location)
-     bfd *abfd;
-     asymbol **location;
+NAME (aout, canonicalize_symtab) (bfd *abfd, asymbol **location)
 {
-    unsigned int counter = 0;
-    aout_symbol_type *symbase;
+  unsigned int counter = 0;
+  aout_symbol_type *symbase;
 
-    if (!NAME(aout,slurp_symbol_table) (abfd))
-      return -1;
+  if (!NAME (aout, slurp_symbol_table) (abfd))
+    return -1;
 
-    for (symbase = obj_aout_symbols (abfd);
-	 counter++ < bfd_get_symcount (abfd);
-	 )
-      *(location++) = (asymbol *) (symbase++);
-    *location++ =0;
-    return bfd_get_symcount (abfd);
+  for (symbase = obj_aout_symbols (abfd);
+       counter++ < bfd_get_symcount (abfd);
+       )
+    *(location++) = (asymbol *) (symbase++);
+  *location++ =0;
+  return bfd_get_symcount (abfd);
 }
 
 /* Standard reloc stuff.  */
 /* Output standard relocation information to a file in target byte order.  */
 
-extern void  NAME(aout,swap_std_reloc_out)
-  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+extern void  NAME (aout, swap_std_reloc_out)
+  (bfd *, arelent *, struct reloc_std_external *);
 
 void
-NAME(aout,swap_std_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
+NAME (aout, swap_std_reloc_out) (bfd *abfd,
+				 arelent *g,
+				 struct reloc_std_external *natptr)
 {
   int r_index;
   asymbol *sym = *(g->sym_ptr_ptr);
@@ -2046,14 +1988,13 @@ NAME(aout,swap_std_reloc_out) (abfd, g, natptr)
 /* Extended stuff.  */
 /* Output extended relocation information to a file in target byte order.  */
 
-extern void NAME(aout,swap_ext_reloc_out)
-  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
+extern void NAME (aout, swap_ext_reloc_out)
+  (bfd *, arelent *, struct reloc_ext_external *);
 
 void
-NAME(aout,swap_ext_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     register struct reloc_ext_external *natptr;
+NAME (aout, swap_ext_reloc_out) (bfd *abfd,
+				 arelent *g,
+				 struct reloc_ext_external *natptr)
 {
   int r_index;
   int r_extern;
@@ -2164,12 +2105,11 @@ NAME(aout,swap_ext_reloc_out) (abfd, g, natptr)
     }
 
 void
-NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_ext_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
+NAME (aout, swap_ext_reloc_in) (bfd *abfd,
+				struct reloc_ext_external *bytes,
+				arelent *cache_ptr,
+				asymbol **symbols,
+				bfd_size_type symcount)
 {
   unsigned int r_index;
   int r_extern;
@@ -2220,12 +2160,11 @@ NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
 }
 
 void
-NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_std_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
+NAME (aout, swap_std_reloc_in) (bfd *abfd,
+				struct reloc_std_external *bytes,
+				arelent *cache_ptr,
+				asymbol **symbols,
+				bfd_size_type symcount)
 {
   unsigned int r_index;
   int r_extern;
@@ -2291,14 +2230,11 @@ NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
 /* Read and swap the relocs for a section.  */
 
 bfd_boolean
-NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
+NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols)
 {
   bfd_size_type count;
   bfd_size_type reloc_size;
-  PTR relocs;
+  void * relocs;
   arelent *reloc_cache;
   size_t each_size;
   unsigned int counter = 0;
@@ -2331,7 +2267,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
   count = reloc_size / each_size;
 
   amt = count * sizeof (arelent);
-  reloc_cache = (arelent *) bfd_zmalloc (amt);
+  reloc_cache = bfd_zmalloc (amt);
   if (reloc_cache == NULL && count != 0)
     return FALSE;
 
@@ -2378,9 +2314,7 @@ NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
 /* Write out a relocation section into an object file.  */
 
 bfd_boolean
-NAME(aout,squirt_out_relocs) (abfd, section)
-     bfd *abfd;
-     asection *section;
+NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section)
 {
   arelent **generic;
   unsigned char *native, *natptr;
@@ -2394,7 +2328,7 @@ NAME(aout,squirt_out_relocs) (abfd, section)
 
   each_size = obj_reloc_entry_size (abfd);
   natsize = (bfd_size_type) each_size * count;
-  native = (unsigned char *) bfd_zalloc (abfd, natsize);
+  native = bfd_zalloc (abfd, natsize);
   if (!native)
     return FALSE;
 
@@ -2417,7 +2351,7 @@ NAME(aout,squirt_out_relocs) (abfd, section)
 			       (struct reloc_std_external *) natptr);
     }
 
-  if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
+  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
       return FALSE;
@@ -2430,11 +2364,10 @@ NAME(aout,squirt_out_relocs) (abfd, section)
 /* This is stupid.  This function should be a boolean predicate.  */
 
 long
-NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
+NAME (aout, canonicalize_reloc) (bfd *abfd,
+				 sec_ptr section,
+				 arelent **relptr,
+				 asymbol **symbols)
 {
   arelent *tblptr = section->relocation;
   unsigned int count;
@@ -2445,7 +2378,7 @@ NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols)
       return 0;
     }
 
-  if (!(tblptr || NAME(aout,slurp_reloc_table) (abfd, section, symbols)))
+  if (!(tblptr || NAME (aout, slurp_reloc_table) (abfd, section, symbols)))
     return -1;
 
   if (section->flags & SEC_CONSTRUCTOR)
@@ -2472,9 +2405,7 @@ NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols)
 }
 
 long
-NAME(aout,get_reloc_upper_bound) (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
+NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect)
 {
   if (bfd_get_format (abfd) != bfd_object)
     {
@@ -2483,17 +2414,17 @@ NAME(aout,get_reloc_upper_bound) (abfd, asect)
     }
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return (sizeof (arelent *) * (asect->reloc_count+1));
+    return sizeof (arelent *) * (asect->reloc_count + 1);
 
   if (asect == obj_datasec (abfd))
-    return (sizeof (arelent *)
-	    * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
-	       + 1));
+    return sizeof (arelent *)
+      * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
+	 + 1);
 
   if (asect == obj_textsec (abfd))
-    return (sizeof (arelent *)
-	    * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
-	       + 1));
+    return sizeof (arelent *)
+      * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
+	 + 1);
 
   if (asect == obj_bsssec (abfd))
     return sizeof (arelent *);
@@ -2506,28 +2437,25 @@ NAME(aout,get_reloc_upper_bound) (abfd, asect)
 }
 
 long
-NAME(aout,get_symtab_upper_bound) (abfd)
-     bfd *abfd;
+NAME (aout, get_symtab_upper_bound) (bfd *abfd)
 {
-  if (!NAME(aout,slurp_symbol_table) (abfd))
+  if (!NAME (aout, slurp_symbol_table) (abfd))
     return -1;
 
   return (bfd_get_symcount (abfd)+1) * (sizeof (aout_symbol_type *));
 }
 
 alent *
-NAME(aout,get_lineno) (ignore_abfd, ignore_symbol)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     asymbol *ignore_symbol ATTRIBUTE_UNUSED;
+NAME (aout, get_lineno) (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			 asymbol *ignore_symbol ATTRIBUTE_UNUSED)
 {
-  return (alent *)NULL;
+  return NULL;
 }
 
 void
-NAME(aout,get_symbol_info) (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+NAME (aout, get_symbol_info) (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			      asymbol *symbol,
+			      symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 
@@ -2551,11 +2479,10 @@ NAME(aout,get_symbol_info) (ignore_abfd, symbol, ret)
 }
 
 void
-NAME(aout,print_symbol) (abfd, afile, symbol, how)
-     bfd *abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
+NAME (aout, print_symbol) (bfd *abfd,
+			   void * afile,
+			   asymbol *symbol,
+			   bfd_print_symbol_type how)
 {
   FILE *file = (FILE *)afile;
 
@@ -2575,7 +2502,7 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how)
       {
 	const char *section_name = symbol->section->name;
 
-	bfd_print_symbol_vandf (abfd, (PTR)file, symbol);
+	bfd_print_symbol_vandf (abfd, (void *)file, symbol);
 
 	fprintf (file," %-5s %04x %02x %02x",
 		 section_name,
@@ -2599,18 +2526,15 @@ NAME(aout,print_symbol) (abfd, afile, symbol, how)
    BFD asymbol structures.  */
 
 long
-NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
-     bfd *abfd;
-     bfd_boolean dynamic;
-     PTR *minisymsp;
-     unsigned int *sizep;
+NAME (aout, read_minisymbols) (bfd *abfd,
+			       bfd_boolean dynamic,
+			       void * *minisymsp,
+			       unsigned int *sizep)
 {
   if (dynamic)
-    {
-      /* We could handle the dynamic symbols here as well, but it's
-         easier to hand them off.  */
-      return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
-    }
+    /* We could handle the dynamic symbols here as well, but it's
+       easier to hand them off.  */
+    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
 
   if (! aout_get_external_symbols (abfd))
     return -1;
@@ -2618,7 +2542,7 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
   if (obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
     return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
 
-  *minisymsp = (PTR) obj_aout_external_syms (abfd);
+  *minisymsp = (void *) obj_aout_external_syms (abfd);
 
   /* By passing the external symbols back from this routine, we are
      giving up control over the memory block.  Clear
@@ -2635,11 +2559,10 @@ NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
    by bfd_make_empty_symbol, which we fill in here.  */
 
 asymbol *
-NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
-     bfd *abfd;
-     bfd_boolean dynamic;
-     const PTR minisym;
-     asymbol *sym;
+NAME (aout, minisymbol_to_symbol) (bfd *abfd,
+				   bfd_boolean dynamic,
+				   const void * minisym,
+				   asymbol *sym)
 {
   if (dynamic
       || obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
@@ -2648,7 +2571,7 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
   memset (sym, 0, sizeof (aout_symbol_type));
 
   /* We call translate_symbol_table to translate a single symbol.  */
-  if (! (NAME(aout,translate_symbol_table)
+  if (! (NAME (aout, translate_symbol_table)
 	 (abfd,
 	  (aout_symbol_type *) sym,
 	  (struct external_nlist *) minisym,
@@ -2666,22 +2589,20 @@ NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
    wanted location.  */
 
 bfd_boolean
-NAME(aout,find_nearest_line)
-     (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *line_ptr;
+NAME (aout, find_nearest_line) (bfd *abfd,
+				asection *section,
+				asymbol **symbols,
+				bfd_vma offset,
+				const char **filename_ptr,
+				const char **functionname_ptr,
+				unsigned int *line_ptr)
 {
   /* Run down the file looking for the filename, function and linenumber.  */
   asymbol **p;
   const char *directory_name = NULL;
   const char *main_file_name = NULL;
   const char *current_file_name = NULL;
-  const char *line_file_name = NULL; /* Value of current_file_name at line number.  */
+  const char *line_file_name = NULL;      /* Value of current_file_name at line number.  */
   const char *line_directory_name = NULL; /* Value of directory_name at line number.  */
   bfd_vma low_line_vma = 0;
   bfd_vma low_func_vma = 0;
@@ -2693,7 +2614,7 @@ NAME(aout,find_nearest_line)
   *functionname_ptr = 0;
   *line_ptr = 0;
 
-  if (symbols != (asymbol **)NULL)
+  if (symbols != NULL)
     {
       for (p = symbols; *p; p++)
 	{
@@ -2821,7 +2742,7 @@ NAME(aout,find_nearest_line)
     adata (abfd).line_buf = buf = NULL;
   else
     {
-      buf = (char *) bfd_malloc (filelen + funclen + 3);
+      buf = bfd_malloc (filelen + funclen + 3);
       adata (abfd).line_buf = buf;
       if (buf == NULL)
 	return FALSE;
@@ -2865,9 +2786,7 @@ NAME(aout,find_nearest_line)
 }
 
 int
-NAME(aout,sizeof_headers) (abfd, execable)
-     bfd *abfd;
-     bfd_boolean execable ATTRIBUTE_UNUSED;
+NAME (aout, sizeof_headers) (bfd *abfd, bfd_boolean execable ATTRIBUTE_UNUSED)
 {
   return adata (abfd).exec_bytes_size;
 }
@@ -2876,8 +2795,7 @@ NAME(aout,sizeof_headers) (abfd, execable)
    read it again later if we need it.  */
 
 bfd_boolean
-NAME(aout,bfd_free_cached_info) (abfd)
-     bfd *abfd;
+NAME (aout, bfd_free_cached_info) (bfd *abfd)
 {
   asection *o;
 
@@ -2896,7 +2814,7 @@ NAME(aout,bfd_free_cached_info) (abfd)
   BFCI_FREE (obj_aout_external_syms (abfd));
   BFCI_FREE (obj_aout_external_strings (abfd));
 #endif
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
+  for (o = abfd->sections; o != NULL; o = o->next)
     BFCI_FREE (o->relocation);
 #undef BFCI_FREE
 
@@ -2905,34 +2823,21 @@ NAME(aout,bfd_free_cached_info) (abfd)
 
 /* a.out link code.  */
 
-static bfd_boolean aout_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static bfd_boolean aout_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *));
-static bfd_boolean aout_link_free_symbols
-  PARAMS ((bfd *));
-static bfd_boolean aout_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *pneeded));
-static bfd_boolean aout_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-
 /* Routine to create an entry in an a.out link hash table.  */
 
 struct bfd_hash_entry *
-NAME(aout,link_hash_newfunc) (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
+NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry,
+				struct bfd_hash_table *table,
+				const char *string)
 {
   struct aout_link_hash_entry *ret = (struct aout_link_hash_entry *) entry;
 
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (ret == (struct aout_link_hash_entry *) NULL)
-    ret = ((struct aout_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct aout_link_hash_entry)));
-  if (ret == (struct aout_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct aout_link_hash_entry *)
@@ -2951,12 +2856,11 @@ NAME(aout,link_hash_newfunc) (entry, table, string)
 /* Initialize an a.out link hash table.  */
 
 bfd_boolean
-NAME(aout,link_hash_table_init) (table, abfd, newfunc)
-     struct aout_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc)
-       PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-		const char *));
+NAME (aout, link_hash_table_init) (struct aout_link_hash_table *table,
+				   bfd *abfd,
+				   struct bfd_hash_entry *(*newfunc)
+				   (struct bfd_hash_entry *, struct bfd_hash_table *,
+				    const char *))
 {
   return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
 }
@@ -2964,92 +2868,237 @@ NAME(aout,link_hash_table_init) (table, abfd, newfunc)
 /* Create an a.out link hash table.  */
 
 struct bfd_link_hash_table *
-NAME(aout,link_hash_table_create) (abfd)
-     bfd *abfd;
+NAME (aout, link_hash_table_create) (bfd *abfd)
 {
   struct aout_link_hash_table *ret;
-  bfd_size_type amt = sizeof (struct aout_link_hash_table);
+  bfd_size_type amt = sizeof (* ret);
 
-  ret = (struct aout_link_hash_table *) bfd_malloc (amt);
+  ret = bfd_malloc (amt);
   if (ret == NULL)
-    return (struct bfd_link_hash_table *) NULL;
+    return NULL;
 
-  if (! NAME(aout,link_hash_table_init) (ret, abfd,
-					 NAME(aout,link_hash_newfunc)))
+  if (! NAME (aout, link_hash_table_init) (ret, abfd,
+					   NAME (aout, link_hash_newfunc)))
     {
       free (ret);
-      return (struct bfd_link_hash_table *) NULL;
+      return NULL;
     }
   return &ret->root;
 }
 
-/* Given an a.out BFD, add symbols to the global hash table as
-   appropriate.  */
+/* Add all symbols from an object file to the hash table.  */
 
-bfd_boolean
-NAME(aout,link_add_symbols) (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+static bfd_boolean
+aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
 {
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return aout_link_add_object_symbols (abfd, info);
-    case bfd_archive:
-      return _bfd_generic_link_add_archive_symbols
-	(abfd, info, aout_link_check_archive_element);
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return FALSE;
-    }
-}
+  bfd_boolean (*add_one_symbol)
+    (struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	     bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	     struct bfd_link_hash_entry **);
+  struct external_nlist *syms;
+  bfd_size_type sym_count;
+  char *strings;
+  bfd_boolean copy;
+  struct aout_link_hash_entry **sym_hash;
+  struct external_nlist *p;
+  struct external_nlist *pend;
+  bfd_size_type amt;
 
-/* Add symbols from an a.out object file.  */
+  syms = obj_aout_external_syms (abfd);
+  sym_count = obj_aout_external_sym_count (abfd);
+  strings = obj_aout_external_strings (abfd);
+  if (info->keep_memory)
+    copy = FALSE;
+  else
+    copy = TRUE;
 
-static bfd_boolean
-aout_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (! aout_get_external_symbols (abfd))
-    return FALSE;
-  if (! aout_link_add_symbols (abfd, info))
-    return FALSE;
-  if (! info->keep_memory)
+  if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
     {
-      if (! aout_link_free_symbols (abfd))
+      if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
+	     (abfd, info, &syms, &sym_count, &strings)))
 	return FALSE;
     }
-  return TRUE;
-}
 
-/* Check a single archive element to see if we need to include it in
-   the link.  *PNEEDED is set according to whether this element is
-   needed in the link or not.  This is called from
-   _bfd_generic_link_add_archive_symbols.  */
-
-static bfd_boolean
-aout_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     bfd_boolean *pneeded;
-{
-  if (! aout_get_external_symbols (abfd))
+  /* We keep a list of the linker hash table entries that correspond
+     to particular symbols.  We could just look them up in the hash
+     table, but keeping the list is more efficient.  Perhaps this
+     should be conditional on info->keep_memory.  */
+  amt = sym_count * sizeof (struct aout_link_hash_entry *);
+  sym_hash = bfd_alloc (abfd, amt);
+  if (sym_hash == NULL && sym_count != 0)
     return FALSE;
+  obj_aout_sym_hashes (abfd) = sym_hash;
 
-  if (! aout_link_check_ar_symbols (abfd, info, pneeded))
-    return FALSE;
+  add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
+  if (add_one_symbol == NULL)
+    add_one_symbol = _bfd_generic_link_add_one_symbol;
 
-  if (*pneeded)
+  p = syms;
+  pend = p + sym_count;
+  for (; p < pend; p++, sym_hash++)
     {
-      if (! aout_link_add_symbols (abfd, info))
-	return FALSE;
-    }
+      int type;
+      const char *name;
+      bfd_vma value;
+      asection *section;
+      flagword flags;
+      const char *string;
 
-  if (! info->keep_memory || ! *pneeded)
-    {
-      if (! aout_link_free_symbols (abfd))
+      *sym_hash = NULL;
+
+      type = H_GET_8 (abfd, p->e_type);
+
+      /* Ignore debugging symbols.  */
+      if ((type & N_STAB) != 0)
+	continue;
+
+      name = strings + GET_WORD (abfd, p->e_strx);
+      value = GET_WORD (abfd, p->e_value);
+      flags = BSF_GLOBAL;
+      string = NULL;
+      switch (type)
+	{
+	default:
+	  abort ();
+
+	case N_UNDF:
+	case N_ABS:
+	case N_TEXT:
+	case N_DATA:
+	case N_BSS:
+	case N_FN_SEQ:
+	case N_COMM:
+	case N_SETV:
+	case N_FN:
+	  /* Ignore symbols that are not externally visible.  */
+	  continue;
+	case N_INDR:
+	  /* Ignore local indirect symbol.  */
+	  ++p;
+	  ++sym_hash;
+	  continue;
+
+	case N_UNDF | N_EXT:
+	  if (value == 0)
+	    {
+	      section = bfd_und_section_ptr;
+	      flags = 0;
+	    }
+	  else
+	    section = bfd_com_section_ptr;
+	  break;
+	case N_ABS | N_EXT:
+	  section = bfd_abs_section_ptr;
+	  break;
+	case N_TEXT | N_EXT:
+	  section = obj_textsec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_DATA | N_EXT:
+	case N_SETV | N_EXT:
+	  /* Treat N_SETV symbols as N_DATA symbol; see comment in
+	     translate_from_native_sym_flags.  */
+	  section = obj_datasec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_BSS | N_EXT:
+	  section = obj_bsssec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_INDR | N_EXT:
+	  /* An indirect symbol.  The next symbol is the symbol
+	     which this one really is.  */
+	  BFD_ASSERT (p + 1 < pend);
+	  ++p;
+	  string = strings + GET_WORD (abfd, p->e_strx);
+	  section = bfd_ind_section_ptr;
+	  flags |= BSF_INDIRECT;
+	  break;
+	case N_COMM | N_EXT:
+	  section = bfd_com_section_ptr;
+	  break;
+	case N_SETA: case N_SETA | N_EXT:
+	  section = bfd_abs_section_ptr;
+	  flags |= BSF_CONSTRUCTOR;
+	  break;
+	case N_SETT: case N_SETT | N_EXT:
+	  section = obj_textsec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_SETD: case N_SETD | N_EXT:
+	  section = obj_datasec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_SETB: case N_SETB | N_EXT:
+	  section = obj_bsssec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_WARNING:
+	  /* A warning symbol.  The next symbol is the one to warn
+	     about.  If there is no next symbol, just look away.  */
+	  if (p + 1 >= pend)
+	    return TRUE;
+	  ++p;
+	  string = name;
+	  name = strings + GET_WORD (abfd, p->e_strx);
+	  section = bfd_und_section_ptr;
+	  flags |= BSF_WARNING;
+	  break;
+	case N_WEAKU:
+	  section = bfd_und_section_ptr;
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKA:
+	  section = bfd_abs_section_ptr;
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKT:
+	  section = obj_textsec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKD:
+	  section = obj_datasec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKB:
+	  section = obj_bsssec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	}
+
+      if (! ((*add_one_symbol)
+	     (info, abfd, name, flags, section, value, string, copy, FALSE,
+	      (struct bfd_link_hash_entry **) sym_hash)))
 	return FALSE;
+
+      /* Restrict the maximum alignment of a common symbol based on
+	 the architecture, since a.out has no way to represent
+	 alignment requirements of a section in a .o file.  FIXME:
+	 This isn't quite right: it should use the architecture of the
+	 output file, not the input files.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_common
+	  && ((*sym_hash)->root.u.c.p->alignment_power >
+	      bfd_get_arch_info (abfd)->section_align_power))
+	(*sym_hash)->root.u.c.p->alignment_power =
+	  bfd_get_arch_info (abfd)->section_align_power;
+
+      /* If this is a set symbol, and we are not building sets, then
+	 it is possible for the hash entry to not have been set.  In
+	 such a case, treat the symbol as not globally defined.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_new)
+	{
+	  BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
+	  *sym_hash = NULL;
+	}
+
+      if (type == (N_INDR | N_EXT) || type == N_WARNING)
+	++sym_hash;
     }
 
   return TRUE;
@@ -3058,26 +3107,42 @@ aout_link_check_archive_element (abfd, info, pneeded)
 /* Free up the internal symbols read from an a.out file.  */
 
 static bfd_boolean
-aout_link_free_symbols (abfd)
-     bfd *abfd;
+aout_link_free_symbols (bfd *abfd)
 {
-  if (obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
+  if (obj_aout_external_syms (abfd) != NULL)
     {
 #ifdef USE_MMAP
       bfd_free_window (&obj_aout_sym_window (abfd));
 #else
-      free ((PTR) obj_aout_external_syms (abfd));
+      free ((void *) obj_aout_external_syms (abfd));
 #endif
-      obj_aout_external_syms (abfd) = (struct external_nlist *) NULL;
+      obj_aout_external_syms (abfd) = NULL;
     }
-  if (obj_aout_external_strings (abfd) != (char *) NULL)
+  if (obj_aout_external_strings (abfd) != NULL)
     {
 #ifdef USE_MMAP
       bfd_free_window (&obj_aout_string_window (abfd));
 #else
-      free ((PTR) obj_aout_external_strings (abfd));
+      free ((void *) obj_aout_external_strings (abfd));
 #endif
-      obj_aout_external_strings (abfd) = (char *) NULL;
+      obj_aout_external_strings (abfd) = NULL;
+    }
+  return TRUE;
+}
+
+/* Add symbols from an a.out object file.  */
+
+static bfd_boolean
+aout_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
+  if (! aout_link_add_symbols (abfd, info))
+    return FALSE;
+  if (! info->keep_memory)
+    {
+      if (! aout_link_free_symbols (abfd))
+	return FALSE;
     }
   return TRUE;
 }
@@ -3090,12 +3155,11 @@ aout_link_free_symbols (abfd)
    (unless there is some other reason to include it).  */
 
 static bfd_boolean
-aout_link_check_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     bfd_boolean *pneeded;
+aout_link_check_ar_symbols (bfd *abfd,
+			    struct bfd_link_info *info,
+			    bfd_boolean *pneeded)
 {
-  register struct external_nlist *p;
+  struct external_nlist *p;
   struct external_nlist *pend;
   char *strings;
 
@@ -3133,7 +3197,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 
       /* We are only interested in symbols that are currently
 	 undefined or common.  */
-      if (h == (struct bfd_link_hash_entry *) NULL
+      if (h == NULL
 	  || (h->type != bfd_link_hash_undefined
 	      && h->type != bfd_link_hash_common))
 	{
@@ -3208,7 +3272,7 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 		  unsigned int power;
 
 		  symbfd = h->u.undef.abfd;
-		  if (symbfd == (bfd *) NULL)
+		  if (symbfd == NULL)
 		    {
 		      /* This symbol was created as undefined from
 			 outside BFD.  We assume that we should link
@@ -3224,9 +3288,8 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
 		  /* Turn the current link symbol into a common
 		     symbol.  It is already on the undefs list.  */
 		  h->type = bfd_link_hash_common;
-		  h->u.c.p = ((struct bfd_link_hash_common_entry *)
-			      bfd_hash_allocate (&info->hash->table,
-				  sizeof (struct bfd_link_hash_common_entry)));
+		  h->u.c.p = bfd_hash_allocate (&info->hash->table,
+						sizeof (struct bfd_link_hash_common_entry));
 		  if (h->u.c.p == NULL)
 		    return FALSE;
 
@@ -3275,225 +3338,54 @@ aout_link_check_ar_symbols (abfd, info, pneeded)
   /* We do not need this object file.  */
   return TRUE;
 }
-
-/* Add all symbols from an object file to the hash table.  */
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called from
+   _bfd_generic_link_add_archive_symbols.  */
 
 static bfd_boolean
-aout_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+aout_link_check_archive_element (bfd *abfd,
+				 struct bfd_link_info *info,
+				 bfd_boolean *pneeded)
 {
-  bfd_boolean (*add_one_symbol)
-    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	     bfd_vma, const char *, bfd_boolean, bfd_boolean,
-	     struct bfd_link_hash_entry **));
-  struct external_nlist *syms;
-  bfd_size_type sym_count;
-  char *strings;
-  bfd_boolean copy;
-  struct aout_link_hash_entry **sym_hash;
-  register struct external_nlist *p;
-  struct external_nlist *pend;
-  bfd_size_type amt;
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
 
-  syms = obj_aout_external_syms (abfd);
-  sym_count = obj_aout_external_sym_count (abfd);
-  strings = obj_aout_external_strings (abfd);
-  if (info->keep_memory)
-    copy = FALSE;
-  else
-    copy = TRUE;
+  if (! aout_link_check_ar_symbols (abfd, info, pneeded))
+    return FALSE;
 
-  if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
+  if (*pneeded)
     {
-      if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
-	     (abfd, info, &syms, &sym_count, &strings)))
+      if (! aout_link_add_symbols (abfd, info))
 	return FALSE;
     }
 
-  /* We keep a list of the linker hash table entries that correspond
-     to particular symbols.  We could just look them up in the hash
-     table, but keeping the list is more efficient.  Perhaps this
-     should be conditional on info->keep_memory.  */
-  amt = sym_count * sizeof (struct aout_link_hash_entry *);
-  sym_hash = (struct aout_link_hash_entry **) bfd_alloc (abfd, amt);
-  if (sym_hash == NULL && sym_count != 0)
-    return FALSE;
-  obj_aout_sym_hashes (abfd) = sym_hash;
-
-  add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
-  if (add_one_symbol == NULL)
-    add_one_symbol = _bfd_generic_link_add_one_symbol;
-
-  p = syms;
-  pend = p + sym_count;
-  for (; p < pend; p++, sym_hash++)
+  if (! info->keep_memory || ! *pneeded)
     {
-      int type;
-      const char *name;
-      bfd_vma value;
-      asection *section;
-      flagword flags;
-      const char *string;
-
-      *sym_hash = NULL;
-
-      type = H_GET_8 (abfd, p->e_type);
-
-      /* Ignore debugging symbols.  */
-      if ((type & N_STAB) != 0)
-	continue;
-
-      name = strings + GET_WORD (abfd, p->e_strx);
-      value = GET_WORD (abfd, p->e_value);
-      flags = BSF_GLOBAL;
-      string = NULL;
-      switch (type)
-	{
-	default:
-	  abort ();
-
-	case N_UNDF:
-	case N_ABS:
-	case N_TEXT:
-	case N_DATA:
-	case N_BSS:
-	case N_FN_SEQ:
-	case N_COMM:
-	case N_SETV:
-	case N_FN:
-	  /* Ignore symbols that are not externally visible.  */
-	  continue;
-	case N_INDR:
-	  /* Ignore local indirect symbol.  */
-	  ++p;
-	  ++sym_hash;
-	  continue;
-
-	case N_UNDF | N_EXT:
-	  if (value == 0)
-	    {
-	      section = bfd_und_section_ptr;
-	      flags = 0;
-	    }
-	  else
-	    section = bfd_com_section_ptr;
-	  break;
-	case N_ABS | N_EXT:
-	  section = bfd_abs_section_ptr;
-	  break;
-	case N_TEXT | N_EXT:
-	  section = obj_textsec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_DATA | N_EXT:
-	case N_SETV | N_EXT:
-	  /* Treat N_SETV symbols as N_DATA symbol; see comment in
-	     translate_from_native_sym_flags.  */
-	  section = obj_datasec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_BSS | N_EXT:
-	  section = obj_bsssec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_INDR | N_EXT:
-	  /* An indirect symbol.  The next symbol is the symbol
-	     which this one really is.  */
-	  BFD_ASSERT (p + 1 < pend);
-	  ++p;
-	  string = strings + GET_WORD (abfd, p->e_strx);
-	  section = bfd_ind_section_ptr;
-	  flags |= BSF_INDIRECT;
-	  break;
-	case N_COMM | N_EXT:
-	  section = bfd_com_section_ptr;
-	  break;
-	case N_SETA: case N_SETA | N_EXT:
-	  section = bfd_abs_section_ptr;
-	  flags |= BSF_CONSTRUCTOR;
-	  break;
-	case N_SETT: case N_SETT | N_EXT:
-	  section = obj_textsec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_SETD: case N_SETD | N_EXT:
-	  section = obj_datasec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_SETB: case N_SETB | N_EXT:
-	  section = obj_bsssec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_WARNING:
-	  /* A warning symbol.  The next symbol is the one to warn
-	     about.  If there is no next symbol, just look away.  */
-	  if (p + 1 >= pend)
-	    return TRUE;
-	  ++p;
-	  string = name;
-	  name = strings + GET_WORD (abfd, p->e_strx);
-	  section = bfd_und_section_ptr;
-	  flags |= BSF_WARNING;
-	  break;
-	case N_WEAKU:
-	  section = bfd_und_section_ptr;
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKA:
-	  section = bfd_abs_section_ptr;
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKT:
-	  section = obj_textsec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKD:
-	  section = obj_datasec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKB:
-	  section = obj_bsssec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	}
-
-      if (! ((*add_one_symbol)
-	     (info, abfd, name, flags, section, value, string, copy, FALSE,
-	      (struct bfd_link_hash_entry **) sym_hash)))
+      if (! aout_link_free_symbols (abfd))
 	return FALSE;
+    }
 
-      /* Restrict the maximum alignment of a common symbol based on
-	 the architecture, since a.out has no way to represent
-	 alignment requirements of a section in a .o file.  FIXME:
-	 This isn't quite right: it should use the architecture of the
-	 output file, not the input files.  */
-      if ((*sym_hash)->root.type == bfd_link_hash_common
-	  && ((*sym_hash)->root.u.c.p->alignment_power >
-	      bfd_get_arch_info (abfd)->section_align_power))
-	(*sym_hash)->root.u.c.p->alignment_power =
-	  bfd_get_arch_info (abfd)->section_align_power;
+  return TRUE;
+}
 
-      /* If this is a set symbol, and we are not building sets, then
-	 it is possible for the hash entry to not have been set.  In
-	 such a case, treat the symbol as not globally defined.  */
-      if ((*sym_hash)->root.type == bfd_link_hash_new)
-	{
-	  BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
-	  *sym_hash = NULL;
-	}
+/* Given an a.out BFD, add symbols to the global hash table as
+   appropriate.  */
 
-      if (type == (N_INDR | N_EXT) || type == N_WARNING)
-	++sym_hash;
+bfd_boolean
+NAME (aout, link_add_symbols) (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return aout_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return _bfd_generic_link_add_archive_symbols
+	(abfd, info, aout_link_check_archive_element);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
     }
-
-  return TRUE;
 }
 
 /* A hash table used for header files with N_BINCL entries.  */
@@ -3547,58 +3439,29 @@ struct aout_final_link_info
   /* A buffer large enough to hold the contents of any section.  */
   bfd_byte *contents;
   /* A buffer large enough to hold the relocs of any section.  */
-  PTR relocs;
+  void * relocs;
   /* A buffer large enough to hold the symbol map of any input BFD.  */
   int *symbol_map;
   /* A buffer large enough to hold output symbols of any input BFD.  */
   struct external_nlist *output_syms;
 };
 
-static struct bfd_hash_entry *aout_link_includes_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static bfd_boolean aout_link_input_bfd
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static bfd_boolean aout_link_write_symbols
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static bfd_boolean aout_link_write_other_symbol
-  PARAMS ((struct aout_link_hash_entry *, PTR));
-static bfd_boolean aout_link_input_section
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, file_ptr *reloff_ptr,
-	   bfd_size_type rel_size));
-static bfd_boolean aout_link_input_section_std
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, struct reloc_std_external *,
-	   bfd_size_type rel_size, bfd_byte *contents));
-static bfd_boolean aout_link_input_section_ext
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, struct reloc_ext_external *,
-	   bfd_size_type rel_size, bfd_byte *contents));
-static INLINE asection *aout_reloc_index_to_section
-  PARAMS ((bfd *, int));
-static bfd_boolean aout_link_reloc_link_order
-  PARAMS ((struct aout_final_link_info *, asection *,
-	   struct bfd_link_order *));
-
 /* The function to create a new entry in the header file hash table.  */
 
 static struct bfd_hash_entry *
-aout_link_includes_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
+aout_link_includes_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
 {
   struct aout_link_includes_entry *ret =
     (struct aout_link_includes_entry *) entry;
 
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (ret == (struct aout_link_includes_entry *) NULL)
-    ret = ((struct aout_link_includes_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct aout_link_includes_entry)));
-  if (ret == (struct aout_link_includes_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct aout_link_includes_entry *)
@@ -3612,907 +3475,11 @@ aout_link_includes_newfunc (entry, table, string)
   return (struct bfd_hash_entry *) ret;
 }
 
-/* Do the final link step.  This is called on the output BFD.  The
-   INFO structure should point to a list of BFDs linked through the
-   link_next field which can be used to find each BFD which takes part
-   in the output.  Also, each section in ABFD should point to a list
-   of bfd_link_order structures which list all the input sections for
-   the output section.  */
-
-bfd_boolean
-NAME(aout,final_link) (abfd, info, callback)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     void (*callback) PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-{
-  struct aout_final_link_info aout_info;
-  bfd_boolean includes_hash_initialized = FALSE;
-  register bfd *sub;
-  bfd_size_type trsize, drsize;
-  bfd_size_type max_contents_size;
-  bfd_size_type max_relocs_size;
-  bfd_size_type max_sym_count;
-  bfd_size_type text_size;
-  file_ptr text_end;
-  register struct bfd_link_order *p;
-  asection *o;
-  bfd_boolean have_link_order_relocs;
-
-  if (info->shared)
-    abfd->flags |= DYNAMIC;
-
-  aout_info.info = info;
-  aout_info.output_bfd = abfd;
-  aout_info.contents = NULL;
-  aout_info.relocs = NULL;
-  aout_info.symbol_map = NULL;
-  aout_info.output_syms = NULL;
-
-  if (! bfd_hash_table_init_n (&aout_info.includes.root,
-			       aout_link_includes_newfunc,
-			       251))
-    goto error_return;
-  includes_hash_initialized = TRUE;
-
-  /* Figure out the largest section size.  Also, if generating
-     relocatable output, count the relocs.  */
-  trsize = 0;
-  drsize = 0;
-  max_contents_size = 0;
-  max_relocs_size = 0;
-  max_sym_count = 0;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      bfd_size_type sz;
-
-      if (info->relocatable)
-	{
-	  if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
-	    {
-	      trsize += exec_hdr (sub)->a_trsize;
-	      drsize += exec_hdr (sub)->a_drsize;
-	    }
-	  else
-	    {
-	      /* FIXME: We need to identify the .text and .data sections
-		 and call get_reloc_upper_bound and canonicalize_reloc to
-		 work out the number of relocs needed, and then multiply
-		 by the reloc size.  */
-	      (*_bfd_error_handler)
-		(_("%s: relocatable link from %s to %s not supported"),
-		 bfd_get_filename (abfd),
-		 sub->xvec->name, abfd->xvec->name);
-	      bfd_set_error (bfd_error_invalid_operation);
-	      goto error_return;
-	    }
-	}
-
-      if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
-	{
-	  sz = obj_textsec (sub)->size;
-	  if (sz > max_contents_size)
-	    max_contents_size = sz;
-	  sz = obj_datasec (sub)->size;
-	  if (sz > max_contents_size)
-	    max_contents_size = sz;
-
-	  sz = exec_hdr (sub)->a_trsize;
-	  if (sz > max_relocs_size)
-	    max_relocs_size = sz;
-	  sz = exec_hdr (sub)->a_drsize;
-	  if (sz > max_relocs_size)
-	    max_relocs_size = sz;
-
-	  sz = obj_aout_external_sym_count (sub);
-	  if (sz > max_sym_count)
-	    max_sym_count = sz;
-	}
-    }
-
-  if (info->relocatable)
-    {
-      if (obj_textsec (abfd) != (asection *) NULL)
-	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
-						 ->link_order_head)
-		   * obj_reloc_entry_size (abfd));
-      if (obj_datasec (abfd) != (asection *) NULL)
-	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
-						 ->link_order_head)
-		   * obj_reloc_entry_size (abfd));
-    }
-
-  exec_hdr (abfd)->a_trsize = trsize;
-  exec_hdr (abfd)->a_drsize = drsize;
-
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-
-  /* Adjust the section sizes and vmas according to the magic number.
-     This sets a_text, a_data and a_bss in the exec_hdr and sets the
-     filepos for each section.  */
-  if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
-    goto error_return;
-
-  /* The relocation and symbol file positions differ among a.out
-     targets.  We are passed a callback routine from the backend
-     specific code to handle this.
-     FIXME: At this point we do not know how much space the symbol
-     table will require.  This will not work for any (nonstandard)
-     a.out target that needs to know the symbol table size before it
-     can compute the relocation file positions.  This may or may not
-     be the case for the hp300hpux target, for example.  */
-  (*callback) (abfd, &aout_info.treloff, &aout_info.dreloff,
-	       &aout_info.symoff);
-  obj_textsec (abfd)->rel_filepos = aout_info.treloff;
-  obj_datasec (abfd)->rel_filepos = aout_info.dreloff;
-  obj_sym_filepos (abfd) = aout_info.symoff;
-
-  /* We keep a count of the symbols as we output them.  */
-  obj_aout_external_sym_count (abfd) = 0;
-
-  /* We accumulate the string table as we write out the symbols.  */
-  aout_info.strtab = _bfd_stringtab_init ();
-  if (aout_info.strtab == NULL)
-    goto error_return;
-
-  /* Allocate buffers to hold section contents and relocs.  */
-  aout_info.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  aout_info.relocs = (PTR) bfd_malloc (max_relocs_size);
-  aout_info.symbol_map = (int *) bfd_malloc (max_sym_count * sizeof (int *));
-  aout_info.output_syms = ((struct external_nlist *)
-			   bfd_malloc ((max_sym_count + 1)
-				       * sizeof (struct external_nlist)));
-  if ((aout_info.contents == NULL && max_contents_size != 0)
-      || (aout_info.relocs == NULL && max_relocs_size != 0)
-      || (aout_info.symbol_map == NULL && max_sym_count != 0)
-      || aout_info.output_syms == NULL)
-    goto error_return;
-
-  /* If we have a symbol named __DYNAMIC, force it out now.  This is
-     required by SunOS.  Doing this here rather than in sunos.c is a
-     hack, but it's easier than exporting everything which would be
-     needed.  */
-  {
-    struct aout_link_hash_entry *h;
-
-    h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
-			       FALSE, FALSE, FALSE);
-    if (h != NULL)
-      aout_link_write_other_symbol (h, &aout_info);
-  }
-
-  /* The most time efficient way to do the link would be to read all
-     the input object files into memory and then sort out the
-     information into the output file.  Unfortunately, that will
-     probably use too much memory.  Another method would be to step
-     through everything that composes the text section and write it
-     out, and then everything that composes the data section and write
-     it out, and then write out the relocs, and then write out the
-     symbols.  Unfortunately, that requires reading stuff from each
-     input file several times, and we will not be able to keep all the
-     input files open simultaneously, and reopening them will be slow.
-
-     What we do is basically process one input file at a time.  We do
-     everything we need to do with an input file once--copy over the
-     section contents, handle the relocation information, and write
-     out the symbols--and then we throw away the information we read
-     from it.  This approach requires a lot of lseeks of the output
-     file, which is unfortunate but still faster than reopening a lot
-     of files.
-
-     We use the output_has_begun field of the input BFDs to see
-     whether we have already handled it.  */
-  for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
-    sub->output_has_begun = FALSE;
-
-  /* Mark all sections which are to be included in the link.  This
-     will normally be every section.  We need to do this so that we
-     can identify any sections which the linker has decided to not
-     include.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	if (p->type == bfd_indirect_link_order)
-	  p->u.indirect.section->linker_mark = TRUE;
-    }
-
-  have_link_order_relocs = FALSE;
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      for (p = o->link_order_head;
-	   p != (struct bfd_link_order *) NULL;
-	   p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_aout_flavour))
-	    {
-	      bfd *input_bfd;
-
-	      input_bfd = p->u.indirect.section->owner;
-	      if (! input_bfd->output_has_begun)
-		{
-		  if (! aout_link_input_bfd (&aout_info, input_bfd))
-		    goto error_return;
-		  input_bfd->output_has_begun = TRUE;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      /* These are handled below.  */
-	      have_link_order_relocs = TRUE;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-  /* Write out any symbols that we have not already written out.  */
-  aout_link_hash_traverse (aout_hash_table (info),
-			   aout_link_write_other_symbol,
-			   (PTR) &aout_info);
-
-  /* Now handle any relocs we were asked to create by the linker.
-     These did not come from any input file.  We must do these after
-     we have written out all the symbols, so that we know the symbol
-     indices to use.  */
-  if (have_link_order_relocs)
-    {
-      for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	{
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      if (p->type == bfd_section_reloc_link_order
-		  || p->type == bfd_symbol_reloc_link_order)
-		{
-		  if (! aout_link_reloc_link_order (&aout_info, o, p))
-		    goto error_return;
-		}
-	    }
-	}
-    }
-
-  if (aout_info.contents != NULL)
-    {
-      free (aout_info.contents);
-      aout_info.contents = NULL;
-    }
-  if (aout_info.relocs != NULL)
-    {
-      free (aout_info.relocs);
-      aout_info.relocs = NULL;
-    }
-  if (aout_info.symbol_map != NULL)
-    {
-      free (aout_info.symbol_map);
-      aout_info.symbol_map = NULL;
-    }
-  if (aout_info.output_syms != NULL)
-    {
-      free (aout_info.output_syms);
-      aout_info.output_syms = NULL;
-    }
-  if (includes_hash_initialized)
-    {
-      bfd_hash_table_free (&aout_info.includes.root);
-      includes_hash_initialized = FALSE;
-    }
-
-  /* Finish up any dynamic linking we may be doing.  */
-  if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
-    {
-      if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
-	goto error_return;
-    }
-
-  /* Update the header information.  */
-  abfd->symcount = obj_aout_external_sym_count (abfd);
-  exec_hdr (abfd)->a_syms = abfd->symcount * EXTERNAL_NLIST_SIZE;
-  obj_str_filepos (abfd) = obj_sym_filepos (abfd) + exec_hdr (abfd)->a_syms;
-  obj_textsec (abfd)->reloc_count =
-    exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
-  obj_datasec (abfd)->reloc_count =
-    exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
-
-  /* Write out the string table, unless there are no symbols.  */
-  if (abfd->symcount > 0)
-    {
-      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
-	  || ! emit_stringtab (abfd, aout_info.strtab))
-	goto error_return;
-    }
-  else if (obj_textsec (abfd)->reloc_count == 0
-	   && obj_datasec (abfd)->reloc_count == 0)
-    {
-      bfd_byte b;
-      file_ptr pos;
-
-      b = 0;
-      pos = obj_datasec (abfd)->filepos + exec_hdr (abfd)->a_data - 1;
-      if (bfd_seek (abfd, pos, SEEK_SET) != 0
-	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
-	goto error_return;
-    }
-
-  return TRUE;
-
- error_return:
-  if (aout_info.contents != NULL)
-    free (aout_info.contents);
-  if (aout_info.relocs != NULL)
-    free (aout_info.relocs);
-  if (aout_info.symbol_map != NULL)
-    free (aout_info.symbol_map);
-  if (aout_info.output_syms != NULL)
-    free (aout_info.output_syms);
-  if (includes_hash_initialized)
-    bfd_hash_table_free (&aout_info.includes.root);
-  return FALSE;
-}
-
-/* Link an a.out input BFD into the output file.  */
-
-static bfd_boolean
-aout_link_input_bfd (finfo, input_bfd)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd_size_type sym_count;
-
-  BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
-
-  /* If this is a dynamic object, it may need special handling.  */
-  if ((input_bfd->flags & DYNAMIC) != 0
-      && aout_backend_info (input_bfd)->link_dynamic_object != NULL)
-    {
-      return ((*aout_backend_info (input_bfd)->link_dynamic_object)
-	      (finfo->info, input_bfd));
-    }
-
-  /* Get the symbols.  We probably have them already, unless
-     finfo->info->keep_memory is FALSE.  */
-  if (! aout_get_external_symbols (input_bfd))
-    return FALSE;
-
-  sym_count = obj_aout_external_sym_count (input_bfd);
-
-  /* Write out the symbols and get a map of the new indices.  The map
-     is placed into finfo->symbol_map.  */
-  if (! aout_link_write_symbols (finfo, input_bfd))
-    return FALSE;
-
-  /* Relocate and write out the sections.  These functions use the
-     symbol map created by aout_link_write_symbols.  The linker_mark
-     field will be set if these sections are to be included in the
-     link, which will normally be the case.  */
-  if (obj_textsec (input_bfd)->linker_mark)
-    {
-      if (! aout_link_input_section (finfo, input_bfd,
-				     obj_textsec (input_bfd),
-				     &finfo->treloff,
-				     exec_hdr (input_bfd)->a_trsize))
-	return FALSE;
-    }
-  if (obj_datasec (input_bfd)->linker_mark)
-    {
-      if (! aout_link_input_section (finfo, input_bfd,
-				     obj_datasec (input_bfd),
-				     &finfo->dreloff,
-				     exec_hdr (input_bfd)->a_drsize))
-	return FALSE;
-    }
-
-  /* If we are not keeping memory, we don't need the symbols any
-     longer.  We still need them if we are keeping memory, because the
-     strings in the hash table point into them.  */
-  if (! finfo->info->keep_memory)
-    {
-      if (! aout_link_free_symbols (input_bfd))
-	return FALSE;
-    }
-
-  return TRUE;
-}
-
-/* Adjust and write out the symbols for an a.out file.  Set the new
-   symbol indices into a symbol_map.  */
-
-static bfd_boolean
-aout_link_write_symbols (finfo, input_bfd)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd *output_bfd;
-  bfd_size_type sym_count;
-  char *strings;
-  enum bfd_link_strip strip;
-  enum bfd_link_discard discard;
-  struct external_nlist *outsym;
-  bfd_size_type strtab_index;
-  register struct external_nlist *sym;
-  struct external_nlist *sym_end;
-  struct aout_link_hash_entry **sym_hash;
-  int *symbol_map;
-  bfd_boolean pass;
-  bfd_boolean skip_next;
-
-  output_bfd = finfo->output_bfd;
-  sym_count = obj_aout_external_sym_count (input_bfd);
-  strings = obj_aout_external_strings (input_bfd);
-  strip = finfo->info->strip;
-  discard = finfo->info->discard;
-  outsym = finfo->output_syms;
-
-  /* First write out a symbol for this object file, unless we are
-     discarding such symbols.  */
-  if (strip != strip_all
-      && (strip != strip_some
-	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
-			      FALSE, FALSE) != NULL)
-      && discard != discard_all)
-    {
-      H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
-      H_PUT_8 (output_bfd, 0, outsym->e_other);
-      H_PUT_16 (output_bfd, 0, outsym->e_desc);
-      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       input_bfd->filename, FALSE);
-      if (strtab_index == (bfd_size_type) -1)
-	return FALSE;
-      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
-      PUT_WORD (output_bfd,
-		(bfd_get_section_vma (output_bfd,
-				      obj_textsec (input_bfd)->output_section)
-		 + obj_textsec (input_bfd)->output_offset),
-		outsym->e_value);
-      ++obj_aout_external_sym_count (output_bfd);
-      ++outsym;
-    }
-
-  pass = FALSE;
-  skip_next = FALSE;
-  sym = obj_aout_external_syms (input_bfd);
-  sym_end = sym + sym_count;
-  sym_hash = obj_aout_sym_hashes (input_bfd);
-  symbol_map = finfo->symbol_map;
-  memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
-  for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
-    {
-      const char *name;
-      int type;
-      struct aout_link_hash_entry *h;
-      bfd_boolean skip;
-      asection *symsec;
-      bfd_vma val = 0;
-      bfd_boolean copy;
-
-      /* We set *symbol_map to 0 above for all symbols.  If it has
-         already been set to -1 for this symbol, it means that we are
-         discarding it because it appears in a duplicate header file.
-         See the N_BINCL code below.  */
-      if (*symbol_map == -1)
-	continue;
-
-      /* Initialize *symbol_map to -1, which means that the symbol was
-         not copied into the output file.  We will change it later if
-         we do copy the symbol over.  */
-      *symbol_map = -1;
-
-      type = H_GET_8 (input_bfd, sym->e_type);
-      name = strings + GET_WORD (input_bfd, sym->e_strx);
-
-      h = NULL;
-
-      if (pass)
-	{
-	  /* Pass this symbol through.  It is the target of an
-	     indirect or warning symbol.  */
-	  val = GET_WORD (input_bfd, sym->e_value);
-	  pass = FALSE;
-	}
-      else if (skip_next)
-	{
-	  /* Skip this symbol, which is the target of an indirect
-	     symbol that we have changed to no longer be an indirect
-	     symbol.  */
-	  skip_next = FALSE;
-	  continue;
-	}
-      else
-	{
-	  struct aout_link_hash_entry *hresolve;
-
-	  /* We have saved the hash table entry for this symbol, if
-	     there is one.  Note that we could just look it up again
-	     in the hash table, provided we first check that it is an
-	     external symbol.  */
-	  h = *sym_hash;
-
-	  /* Use the name from the hash table, in case the symbol was
-             wrapped.  */
-	  if (h != NULL
-	      && h->root.type != bfd_link_hash_warning)
-	    name = h->root.root.string;
-
-	  /* If this is an indirect or warning symbol, then change
-	     hresolve to the base symbol.  We also change *sym_hash so
-	     that the relocation routines relocate against the real
-	     symbol.  */
-	  hresolve = h;
-	  if (h != (struct aout_link_hash_entry *) NULL
-	      && (h->root.type == bfd_link_hash_indirect
-		  || h->root.type == bfd_link_hash_warning))
-	    {
-	      hresolve = (struct aout_link_hash_entry *) h->root.u.i.link;
-	      while (hresolve->root.type == bfd_link_hash_indirect
-		     || hresolve->root.type == bfd_link_hash_warning)
-		hresolve = ((struct aout_link_hash_entry *)
-			    hresolve->root.u.i.link);
-	      *sym_hash = hresolve;
-	    }
-
-	  /* If the symbol has already been written out, skip it.  */
-	  if (h != (struct aout_link_hash_entry *) NULL
-	      && h->written)
-	    {
-	      if ((type & N_TYPE) == N_INDR
-		  || type == N_WARNING)
-		skip_next = TRUE;
-	      *symbol_map = h->indx;
-	      continue;
-	    }
-
-	  /* See if we are stripping this symbol.  */
-	  skip = FALSE;
-	  switch (strip)
-	    {
-	    case strip_none:
-	      break;
-	    case strip_debugger:
-	      if ((type & N_STAB) != 0)
-		skip = TRUE;
-	      break;
-	    case strip_some:
-	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
-		  == NULL)
-		skip = TRUE;
-	      break;
-	    case strip_all:
-	      skip = TRUE;
-	      break;
-	    }
-	  if (skip)
-	    {
-	      if (h != (struct aout_link_hash_entry *) NULL)
-		h->written = TRUE;
-	      continue;
-	    }
-
-	  /* Get the value of the symbol.  */
-	  if ((type & N_TYPE) == N_TEXT
-	      || type == N_WEAKT)
-	    symsec = obj_textsec (input_bfd);
-	  else if ((type & N_TYPE) == N_DATA
-		   || type == N_WEAKD)
-	    symsec = obj_datasec (input_bfd);
-	  else if ((type & N_TYPE) == N_BSS
-		   || type == N_WEAKB)
-	    symsec = obj_bsssec (input_bfd);
-	  else if ((type & N_TYPE) == N_ABS
-		   || type == N_WEAKA)
-	    symsec = bfd_abs_section_ptr;
-	  else if (((type & N_TYPE) == N_INDR
-		    && (hresolve == (struct aout_link_hash_entry *) NULL
-			|| (hresolve->root.type != bfd_link_hash_defined
-			    && hresolve->root.type != bfd_link_hash_defweak
-			    && hresolve->root.type != bfd_link_hash_common)))
-		   || type == N_WARNING)
-	    {
-	      /* Pass the next symbol through unchanged.  The
-		 condition above for indirect symbols is so that if
-		 the indirect symbol was defined, we output it with
-		 the correct definition so the debugger will
-		 understand it.  */
-	      pass = TRUE;
-	      val = GET_WORD (input_bfd, sym->e_value);
-	      symsec = NULL;
-	    }
-	  else if ((type & N_STAB) != 0)
-	    {
-	      val = GET_WORD (input_bfd, sym->e_value);
-	      symsec = NULL;
-	    }
-	  else
-	    {
-	      /* If we get here with an indirect symbol, it means that
-		 we are outputting it with a real definition.  In such
-		 a case we do not want to output the next symbol,
-		 which is the target of the indirection.  */
-	      if ((type & N_TYPE) == N_INDR)
-		skip_next = TRUE;
-
-	      symsec = NULL;
-
-	      /* We need to get the value from the hash table.  We use
-		 hresolve so that if we have defined an indirect
-		 symbol we output the final definition.  */
-	      if (h == (struct aout_link_hash_entry *) NULL)
-		{
-		  switch (type & N_TYPE)
-		    {
-		    case N_SETT:
-		      symsec = obj_textsec (input_bfd);
-		      break;
-		    case N_SETD:
-		      symsec = obj_datasec (input_bfd);
-		      break;
-		    case N_SETB:
-		      symsec = obj_bsssec (input_bfd);
-		      break;
-		    case N_SETA:
-		      symsec = bfd_abs_section_ptr;
-		      break;
-		    default:
-		      val = 0;
-		      break;
-		    }
-		}
-	      else if (hresolve->root.type == bfd_link_hash_defined
-		       || hresolve->root.type == bfd_link_hash_defweak)
-		{
-		  asection *input_section;
-		  asection *output_section;
-
-		  /* This case usually means a common symbol which was
-		     turned into a defined symbol.  */
-		  input_section = hresolve->root.u.def.section;
-		  output_section = input_section->output_section;
-		  BFD_ASSERT (bfd_is_abs_section (output_section)
-			      || output_section->owner == output_bfd);
-		  val = (hresolve->root.u.def.value
-			 + bfd_get_section_vma (output_bfd, output_section)
-			 + input_section->output_offset);
-
-		  /* Get the correct type based on the section.  If
-		     this is a constructed set, force it to be
-		     globally visible.  */
-		  if (type == N_SETT
-		      || type == N_SETD
-		      || type == N_SETB
-		      || type == N_SETA)
-		    type |= N_EXT;
-
-		  type &=~ N_TYPE;
-
-		  if (output_section == obj_textsec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_TEXT
-			     : N_WEAKT);
-		  else if (output_section == obj_datasec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_DATA
-			     : N_WEAKD);
-		  else if (output_section == obj_bsssec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_BSS
-			     : N_WEAKB);
-		  else
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_ABS
-			     : N_WEAKA);
-		}
-	      else if (hresolve->root.type == bfd_link_hash_common)
-		val = hresolve->root.u.c.size;
-	      else if (hresolve->root.type == bfd_link_hash_undefweak)
-		{
-		  val = 0;
-		  type = N_WEAKU;
-		}
-	      else
-		val = 0;
-	    }
-	  if (symsec != (asection *) NULL)
-	    val = (symsec->output_section->vma
-		   + symsec->output_offset
-		   + (GET_WORD (input_bfd, sym->e_value)
-		      - symsec->vma));
-
-	  /* If this is a global symbol set the written flag, and if
-	     it is a local symbol see if we should discard it.  */
-	  if (h != (struct aout_link_hash_entry *) NULL)
-	    {
-	      h->written = TRUE;
-	      h->indx = obj_aout_external_sym_count (output_bfd);
-	    }
-	  else if ((type & N_TYPE) != N_SETT
-		   && (type & N_TYPE) != N_SETD
-		   && (type & N_TYPE) != N_SETB
-		   && (type & N_TYPE) != N_SETA)
-	    {
-	      switch (discard)
-		{
-		case discard_none:
-		case discard_sec_merge:
-		  break;
-		case discard_l:
-		  if ((type & N_STAB) == 0
-		      && bfd_is_local_label_name (input_bfd, name))
-		    skip = TRUE;
-		  break;
-		case discard_all:
-		  skip = TRUE;
-		  break;
-		}
-	      if (skip)
-		{
-		  pass = FALSE;
-		  continue;
-		}
-	    }
-
-	  /* An N_BINCL symbol indicates the start of the stabs
-	     entries for a header file.  We need to scan ahead to the
-	     next N_EINCL symbol, ignoring nesting, adding up all the
-	     characters in the symbol names, not including the file
-	     numbers in types (the first number after an open
-	     parenthesis).  */
-	  if (type == (int) N_BINCL)
-	    {
-	      struct external_nlist *incl_sym;
-	      int nest;
-	      struct aout_link_includes_entry *incl_entry;
-	      struct aout_link_includes_totals *t;
-
-	      val = 0;
-	      nest = 0;
-	      for (incl_sym = sym + 1; incl_sym < sym_end; incl_sym++)
-		{
-		  int incl_type;
-
-		  incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
-		  if (incl_type == (int) N_EINCL)
-		    {
-		      if (nest == 0)
-			break;
-		      --nest;
-		    }
-		  else if (incl_type == (int) N_BINCL)
-		    ++nest;
-		  else if (nest == 0)
-		    {
-		      const char *s;
-
-		      s = strings + GET_WORD (input_bfd, incl_sym->e_strx);
-		      for (; *s != '\0'; s++)
-			{
-			  val += *s;
-			  if (*s == '(')
-			    {
-			      /* Skip the file number.  */
-			      ++s;
-			      while (ISDIGIT (*s))
-				++s;
-			      --s;
-			    }
-			}
-		    }
-		}
-
-	      /* If we have already included a header file with the
-                 same value, then replace this one with an N_EXCL
-                 symbol.  */
-	      copy = (bfd_boolean) (! finfo->info->keep_memory);
-	      incl_entry = aout_link_includes_lookup (&finfo->includes,
-						      name, TRUE, copy);
-	      if (incl_entry == NULL)
-		return FALSE;
-	      for (t = incl_entry->totals; t != NULL; t = t->next)
-		if (t->total == val)
-		  break;
-	      if (t == NULL)
-		{
-		  /* This is the first time we have seen this header
-                     file with this set of stabs strings.  */
-		  t = ((struct aout_link_includes_totals *)
-		       bfd_hash_allocate (&finfo->includes.root,
-					  sizeof *t));
-		  if (t == NULL)
-		    return FALSE;
-		  t->total = val;
-		  t->next = incl_entry->totals;
-		  incl_entry->totals = t;
-		}
-	      else
-		{
-		  int *incl_map;
-
-		  /* This is a duplicate header file.  We must change
-                     it to be an N_EXCL entry, and mark all the
-                     included symbols to prevent outputting them.  */
-		  type = (int) N_EXCL;
-
-		  nest = 0;
-		  for (incl_sym = sym + 1, incl_map = symbol_map + 1;
-		       incl_sym < sym_end;
-		       incl_sym++, incl_map++)
-		    {
-		      int incl_type;
-
-		      incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
-		      if (incl_type == (int) N_EINCL)
-			{
-			  if (nest == 0)
-			    {
-			      *incl_map = -1;
-			      break;
-			    }
-			  --nest;
-			}
-		      else if (incl_type == (int) N_BINCL)
-			++nest;
-		      else if (nest == 0)
-			*incl_map = -1;
-		    }
-		}
-	    }
-	}
-
-      /* Copy this symbol into the list of symbols we are going to
-	 write out.  */
-      H_PUT_8 (output_bfd, type, outsym->e_type);
-      H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
-      H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
-      copy = FALSE;
-      if (! finfo->info->keep_memory)
-	{
-	  /* name points into a string table which we are going to
-	     free.  If there is a hash table entry, use that string.
-	     Otherwise, copy name into memory.  */
-	  if (h != (struct aout_link_hash_entry *) NULL)
-	    name = h->root.root.string;
-	  else
-	    copy = TRUE;
-	}
-      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       name, copy);
-      if (strtab_index == (bfd_size_type) -1)
-	return FALSE;
-      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
-      PUT_WORD (output_bfd, val, outsym->e_value);
-      *symbol_map = obj_aout_external_sym_count (output_bfd);
-      ++obj_aout_external_sym_count (output_bfd);
-      ++outsym;
-    }
-
-  /* Write out the output symbols we have just constructed.  */
-  if (outsym > finfo->output_syms)
-    {
-      bfd_size_type outsym_size;
-
-      if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
-	return FALSE;
-      outsym_size = outsym - finfo->output_syms;
-      outsym_size *= EXTERNAL_NLIST_SIZE;
-      if (bfd_bwrite ((PTR) finfo->output_syms, outsym_size, output_bfd)
-	  != outsym_size)
-	return FALSE;
-      finfo->symoff += outsym_size;
-    }
-
-  return TRUE;
-}
-
 /* Write out a symbol that was not associated with an a.out input
    object.  */
 
 static bfd_boolean
-aout_link_write_other_symbol (h, data)
-     struct aout_link_hash_entry *h;
-     PTR data;
+aout_link_write_other_symbol (struct aout_link_hash_entry *h, void * data)
 {
   struct aout_final_link_info *finfo = (struct aout_final_link_info *) data;
   bfd *output_bfd;
@@ -4610,20 +3577,17 @@ aout_link_write_other_symbol (h, data)
   indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
 			   FALSE);
   if (indx == - (bfd_size_type) 1)
-    {
-      /* FIXME: No way to handle errors.  */
-      abort ();
-    }
+    /* FIXME: No way to handle errors.  */
+    abort ();
+
   PUT_WORD (output_bfd, indx, outsym.e_strx);
   PUT_WORD (output_bfd, val, outsym.e_value);
 
   amt = EXTERNAL_NLIST_SIZE;
   if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
-      || bfd_bwrite ((PTR) &outsym, amt, output_bfd) != amt)
-    {
-      /* FIXME: No way to handle errors.  */
-      abort ();
-    }
+      || bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt)
+    /* FIXME: No way to handle errors.  */
+    abort ();
 
   finfo->symoff += EXTERNAL_NLIST_SIZE;
   h->indx = obj_aout_external_sym_count (output_bfd);
@@ -4632,129 +3596,260 @@ aout_link_write_other_symbol (h, data)
   return TRUE;
 }
 
-/* Link an a.out section into the output file.  */
+/* Handle a link order which is supposed to generate a reloc.  */
 
 static bfd_boolean
-aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
-			 rel_size)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     file_ptr *reloff_ptr;
-     bfd_size_type rel_size;
+aout_link_reloc_link_order (struct aout_final_link_info *finfo,
+			    asection *o,
+			    struct bfd_link_order *p)
 {
-  bfd_size_type input_size;
-  PTR relocs;
+  struct bfd_link_order_reloc *pr;
+  int r_index;
+  int r_extern;
+  reloc_howto_type *howto;
+  file_ptr *reloff_ptr = NULL;
+  struct reloc_std_external srel;
+  struct reloc_ext_external erel;
+  void * rel_ptr;
+  bfd_size_type amt;
 
-  /* Get the section contents.  */
-  input_size = input_section->size;
-  if (! bfd_get_section_contents (input_bfd, input_section,
-				  (PTR) finfo->contents,
-				  (file_ptr) 0, input_size))
-    return FALSE;
+  pr = p->u.reloc.p;
 
-  /* Read in the relocs if we haven't already done it.  */
-  if (aout_section_data (input_section) != NULL
-      && aout_section_data (input_section)->relocs != NULL)
-    relocs = aout_section_data (input_section)->relocs;
+  if (p->type == bfd_section_reloc_link_order)
+    {
+      r_extern = 0;
+      if (bfd_is_abs_section (pr->u.section))
+	r_index = N_ABS | N_EXT;
+      else
+	{
+	  BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
+	  r_index = pr->u.section->target_index;
+	}
+    }
   else
     {
-      relocs = finfo->relocs;
-      if (rel_size > 0)
+      struct aout_link_hash_entry *h;
+
+      BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
+      r_extern = 1;
+      h = ((struct aout_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
+					 pr->u.name, FALSE, FALSE, TRUE));
+      if (h != NULL
+	  && h->indx >= 0)
+	r_index = h->indx;
+      else if (h != NULL)
 	{
-	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
-	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
+	  /* We decided to strip this symbol, but it turns out that we
+	     can't.  Note that we lose the other and desc information
+	     here.  I don't think that will ever matter for a global
+	     symbol.  */
+	  h->indx = -2;
+	  h->written = FALSE;
+	  if (! aout_link_write_other_symbol (h, (void *) finfo))
+	    return FALSE;
+	  r_index = h->indx;
+	}
+      else
+	{
+	  if (! ((*finfo->info->callbacks->unattached_reloc)
+		 (finfo->info, pr->u.name, NULL, NULL, (bfd_vma) 0)))
 	    return FALSE;
+	  r_index = 0;
 	}
     }
 
-  /* Relocate the section contents.  */
-  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
+  howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
+  if (howto == 0)
     {
-      if (! aout_link_input_section_std (finfo, input_bfd, input_section,
-					 (struct reloc_std_external *) relocs,
-					 rel_size, finfo->contents))
-	return FALSE;
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
     }
+
+  if (o == obj_textsec (finfo->output_bfd))
+    reloff_ptr = &finfo->treloff;
+  else if (o == obj_datasec (finfo->output_bfd))
+    reloff_ptr = &finfo->dreloff;
   else
+    abort ();
+
+  if (obj_reloc_entry_size (finfo->output_bfd) == RELOC_STD_SIZE)
     {
-      if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
-					 (struct reloc_ext_external *) relocs,
-					 rel_size, finfo->contents))
-	return FALSE;
-    }
+#ifdef MY_put_reloc
+      MY_put_reloc (finfo->output_bfd, r_extern, r_index, p->offset, howto,
+		    &srel);
+#else
+      {
+	int r_pcrel;
+	int r_baserel;
+	int r_jmptable;
+	int r_relative;
+	int r_length;
 
-  /* Write out the section contents.  */
-  if (! bfd_set_section_contents (finfo->output_bfd,
-				  input_section->output_section,
-				  (PTR) finfo->contents,
-				  (file_ptr) input_section->output_offset,
-				  input_size))
-    return FALSE;
+	r_pcrel = (int) howto->pc_relative;
+	r_baserel = (howto->type & 8) != 0;
+	r_jmptable = (howto->type & 16) != 0;
+	r_relative = (howto->type & 32) != 0;
+	r_length = howto->size;
 
-  /* If we are producing relocatable output, the relocs were
-     modified, and we now write them out.  */
-  if (finfo->info->relocatable && rel_size > 0)
+	PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
+	if (bfd_header_big_endian (finfo->output_bfd))
+	  {
+	    srel.r_index[0] = r_index >> 16;
+	    srel.r_index[1] = r_index >> 8;
+	    srel.r_index[2] = r_index;
+	    srel.r_type[0] =
+	      ((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
+	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
+	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_BIG : 0)
+	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
+	       | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
+	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+	  }
+	else
+	  {
+	    srel.r_index[2] = r_index >> 16;
+	    srel.r_index[1] = r_index >> 8;
+	    srel.r_index[0] = r_index;
+	    srel.r_type[0] =
+	      ((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
+	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
+	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_LITTLE : 0)
+	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
+	       | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
+	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+	  }
+      }
+#endif
+      rel_ptr = (void *) &srel;
+
+      /* We have to write the addend into the object file, since
+	 standard a.out relocs are in place.  It would be more
+	 reliable if we had the current contents of the file here,
+	 rather than assuming zeroes, but we can't read the file since
+	 it was opened using bfd_openw.  */
+      if (pr->addend != 0)
+	{
+	  bfd_size_type size;
+	  bfd_reloc_status_type r;
+	  bfd_byte *buf;
+	  bfd_boolean ok;
+
+	  size = bfd_get_reloc_size (howto);
+	  buf = bfd_zmalloc (size);
+	  if (buf == NULL)
+	    return FALSE;
+	  r = MY_relocate_contents (howto, finfo->output_bfd,
+				    (bfd_vma) pr->addend, buf);
+	  switch (r)
+	    {
+	    case bfd_reloc_ok:
+	      break;
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      if (! ((*finfo->info->callbacks->reloc_overflow)
+		     (finfo->info, NULL,
+		      (p->type == bfd_section_reloc_link_order
+		       ? bfd_section_name (finfo->output_bfd,
+					   pr->u.section)
+		       : pr->u.name),
+		      howto->name, pr->addend, NULL, NULL, (bfd_vma) 0)))
+		{
+		  free (buf);
+		  return FALSE;
+		}
+	      break;
+	    }
+	  ok = bfd_set_section_contents (finfo->output_bfd, o, (void *) buf,
+					 (file_ptr) p->offset, size);
+	  free (buf);
+	  if (! ok)
+	    return FALSE;
+	}
+    }
+  else
     {
-      if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
-	return FALSE;
-      if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
-	return FALSE;
-      *reloff_ptr += rel_size;
+#ifdef MY_put_ext_reloc
+      MY_put_ext_reloc (finfo->output_bfd, r_extern, r_index, p->offset,
+			howto, &erel, pr->addend);
+#else
+      PUT_WORD (finfo->output_bfd, p->offset, erel.r_address);
 
-      /* Assert that the relocs have not run into the symbols, and
-	 that if these are the text relocs they have not run into the
-	 data relocs.  */
-      BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
-		  && (reloff_ptr != &finfo->treloff
-		      || (*reloff_ptr
-			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+      if (bfd_header_big_endian (finfo->output_bfd))
+	{
+	  erel.r_index[0] = r_index >> 16;
+	  erel.r_index[1] = r_index >> 8;
+	  erel.r_index[2] = r_index;
+	  erel.r_type[0] =
+	    ((r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
+	     | (howto->type << RELOC_EXT_BITS_TYPE_SH_BIG));
+	}
+      else
+	{
+	  erel.r_index[2] = r_index >> 16;
+	  erel.r_index[1] = r_index >> 8;
+	  erel.r_index[0] = r_index;
+	  erel.r_type[0] =
+	    (r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
+	      | (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
+	}
+
+      PUT_WORD (finfo->output_bfd, (bfd_vma) pr->addend, erel.r_addend);
+#endif /* MY_put_ext_reloc */
+
+      rel_ptr = (void *) &erel;
     }
 
+  amt = obj_reloc_entry_size (finfo->output_bfd);
+  if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
+      || bfd_bwrite (rel_ptr, amt, finfo->output_bfd) != amt)
+    return FALSE;
+
+  *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
+
+  /* Assert that the relocs have not run into the symbols, and that n
+     the text relocs have not run into the data relocs.  */
+  BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+	      && (reloff_ptr != &finfo->treloff
+		  || (*reloff_ptr
+		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+
   return TRUE;
 }
 
 /* Get the section corresponding to a reloc index.  */
 
 static INLINE asection *
-aout_reloc_index_to_section (abfd, indx)
-     bfd *abfd;
-     int indx;
+aout_reloc_index_to_section (bfd *abfd, int indx)
 {
   switch (indx & N_TYPE)
     {
-    case N_TEXT:
-      return obj_textsec (abfd);
-    case N_DATA:
-      return obj_datasec (abfd);
-    case N_BSS:
-      return obj_bsssec (abfd);
+    case N_TEXT:   return obj_textsec (abfd);
+    case N_DATA:   return obj_datasec (abfd);
+    case N_BSS:    return obj_bsssec (abfd);
     case N_ABS:
-    case N_UNDF:
-      return bfd_abs_section_ptr;
-    default:
-      abort ();
+    case N_UNDF:   return bfd_abs_section_ptr;
+    default:       abort ();
     }
-  /*NOTREACHED*/
   return NULL;
 }
 
 /* Relocate an a.out section using standard a.out relocs.  */
 
 static bfd_boolean
-aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
-			     rel_size, contents)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     struct reloc_std_external *relocs;
-     bfd_size_type rel_size;
-     bfd_byte *contents;
+aout_link_input_section_std (struct aout_final_link_info *finfo,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     struct reloc_std_external *relocs,
+			     bfd_size_type rel_size,
+			     bfd_byte *contents)
 {
   bfd_boolean (*check_dynamic_reloc)
-    PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	     struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
-	     bfd_vma *));
+    (struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *,
+	     bfd_vma *);
   bfd *output_bfd;
   bfd_boolean relocatable;
   struct external_nlist *syms;
@@ -4762,7 +3857,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
   struct aout_link_hash_entry **sym_hashes;
   int *symbol_map;
   bfd_size_type reloc_count;
-  register struct reloc_std_external *rel;
+  struct reloc_std_external *rel;
   struct reloc_std_external *rel_end;
 
   output_bfd = finfo->output_bfd;
@@ -4851,7 +3946,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 		 convert it into a relocation against a section.  This
 		 is what the native linker does.  */
 	      h = sym_hashes[r_index];
-	      if (h != (struct aout_link_hash_entry *) NULL
+	      if (h != NULL
 		  && (h->root.type == bfd_link_hash_defined
 		      || h->root.type == bfd_link_hash_defweak))
 		{
@@ -4900,7 +3995,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 			      h->indx = -2;
 			      h->written = FALSE;
 			      if (! aout_link_write_other_symbol (h,
-								  (PTR) finfo))
+								  (void *) finfo))
 				return FALSE;
 			    }
 			  r_index = h->indx;
@@ -4984,7 +4079,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 	    {
 	      h = sym_hashes[r_index];
 
-	      if (h != (struct aout_link_hash_entry *) NULL
+	      if (h != NULL
 		  && (h->root.type == bfd_link_hash_defined
 		      || h->root.type == bfd_link_hash_defweak))
 		{
@@ -4992,7 +4087,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 				+ h->root.u.def.section->output_section->vma
 				+ h->root.u.def.section->output_offset);
 		}
-	      else if (h != (struct aout_link_hash_entry *) NULL
+	      else if (h != NULL
 		       && h->root.type == bfd_link_hash_undefweak)
 		relocation = 0;
 	      else
@@ -5019,7 +4114,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 
 	      if (! ((*check_dynamic_reloc)
 		     (finfo->info, input_bfd, input_section, h,
-		      (PTR) rel, contents, &skip, &relocation)))
+		      (void *) rel, contents, &skip, &relocation)))
 		return FALSE;
 	      if (skip)
 		continue;
@@ -5088,19 +4183,17 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
 /* Relocate an a.out section using extended a.out relocs.  */
 
 static bfd_boolean
-aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
-			     rel_size, contents)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     struct reloc_ext_external *relocs;
-     bfd_size_type rel_size;
-     bfd_byte *contents;
+aout_link_input_section_ext (struct aout_final_link_info *finfo,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     struct reloc_ext_external *relocs,
+			     bfd_size_type rel_size,
+			     bfd_byte *contents)
 {
   bfd_boolean (*check_dynamic_reloc)
-    PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	     struct aout_link_hash_entry *, PTR, bfd_byte *, bfd_boolean *,
-	     bfd_vma *));
+    (struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *,
+	     bfd_vma *);
   bfd *output_bfd;
   bfd_boolean relocatable;
   struct external_nlist *syms;
@@ -5108,7 +4201,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
   struct aout_link_hash_entry **sym_hashes;
   int *symbol_map;
   bfd_size_type reloc_count;
-  register struct reloc_ext_external *rel;
+  struct reloc_ext_external *rel;
   struct reloc_ext_external *rel_end;
 
   output_bfd = finfo->output_bfd;
@@ -5181,7 +4274,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 		h = NULL;
 	      else
 		h = sym_hashes[r_index];
-	      if (h != (struct aout_link_hash_entry *) NULL
+	      if (h != NULL
 		  && (h->root.type == bfd_link_hash_defined
 		      || h->root.type == bfd_link_hash_defweak))
 		{
@@ -5238,7 +4331,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 			      h->indx = -2;
 			      h->written = FALSE;
 			      if (! aout_link_write_other_symbol (h,
-								  (PTR) finfo))
+								  (void *) finfo))
 				return FALSE;
 			    }
 			  r_index = h->indx;
@@ -5328,7 +4421,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 	    {
 	      h = sym_hashes[r_index];
 
-	      if (h != (struct aout_link_hash_entry *) NULL
+	      if (h != NULL
 		  && (h->root.type == bfd_link_hash_defined
 		      || h->root.type == bfd_link_hash_defweak))
 		{
@@ -5336,7 +4429,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 				+ h->root.u.def.section->output_section->vma
 				+ h->root.u.def.section->output_offset);
 		}
-	      else if (h != (struct aout_link_hash_entry *) NULL
+	      else if (h != NULL
 		       && h->root.type == bfd_link_hash_undefweak)
 		relocation = 0;
 	      else
@@ -5418,7 +4511,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
 
 	      if (! ((*check_dynamic_reloc)
 		     (finfo->info, input_bfd, input_section, h,
-		      (PTR) rel, contents, &skip, &relocation)))
+		      (void *) rel, contents, &skip, &relocation)))
 		return FALSE;
 	      if (skip)
 		continue;
@@ -5501,228 +4594,967 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
   return TRUE;
 }
 
-/* Handle a link order which is supposed to generate a reloc.  */
+/* Link an a.out section into the output file.  */
 
 static bfd_boolean
-aout_link_reloc_link_order (finfo, o, p)
-     struct aout_final_link_info *finfo;
-     asection *o;
-     struct bfd_link_order *p;
+aout_link_input_section (struct aout_final_link_info *finfo,
+			 bfd *input_bfd,
+			 asection *input_section,
+			 file_ptr *reloff_ptr,
+			 bfd_size_type rel_size)
 {
-  struct bfd_link_order_reloc *pr;
-  int r_index;
-  int r_extern;
-  reloc_howto_type *howto;
-  file_ptr *reloff_ptr = NULL;
-  struct reloc_std_external srel;
-  struct reloc_ext_external erel;
-  PTR rel_ptr;
-  bfd_size_type amt;
+  bfd_size_type input_size;
+  void * relocs;
 
-  pr = p->u.reloc.p;
+  /* Get the section contents.  */
+  input_size = input_section->size;
+  if (! bfd_get_section_contents (input_bfd, input_section,
+				  (void *) finfo->contents,
+				  (file_ptr) 0, input_size))
+    return FALSE;
 
-  if (p->type == bfd_section_reloc_link_order)
+  /* Read in the relocs if we haven't already done it.  */
+  if (aout_section_data (input_section) != NULL
+      && aout_section_data (input_section)->relocs != NULL)
+    relocs = aout_section_data (input_section)->relocs;
+  else
     {
-      r_extern = 0;
-      if (bfd_is_abs_section (pr->u.section))
-	r_index = N_ABS | N_EXT;
-      else
+      relocs = finfo->relocs;
+      if (rel_size > 0)
 	{
-	  BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
-	  r_index = pr->u.section->target_index;
+	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
+	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
+	    return FALSE;
 	}
     }
+
+  /* Relocate the section contents.  */
+  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
+    {
+      if (! aout_link_input_section_std (finfo, input_bfd, input_section,
+					 (struct reloc_std_external *) relocs,
+					 rel_size, finfo->contents))
+	return FALSE;
+    }
   else
     {
+      if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
+					 (struct reloc_ext_external *) relocs,
+					 rel_size, finfo->contents))
+	return FALSE;
+    }
+
+  /* Write out the section contents.  */
+  if (! bfd_set_section_contents (finfo->output_bfd,
+				  input_section->output_section,
+				  (void *) finfo->contents,
+				  (file_ptr) input_section->output_offset,
+				  input_size))
+    return FALSE;
+
+  /* If we are producing relocatable output, the relocs were
+     modified, and we now write them out.  */
+  if (finfo->info->relocatable && rel_size > 0)
+    {
+      if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
+	return FALSE;
+      if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
+	return FALSE;
+      *reloff_ptr += rel_size;
+
+      /* Assert that the relocs have not run into the symbols, and
+	 that if these are the text relocs they have not run into the
+	 data relocs.  */
+      BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+		  && (reloff_ptr != &finfo->treloff
+		      || (*reloff_ptr
+			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+    }
+
+  return TRUE;
+}
+
+/* Adjust and write out the symbols for an a.out file.  Set the new
+   symbol indices into a symbol_map.  */
+
+static bfd_boolean
+aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  bfd *output_bfd;
+  bfd_size_type sym_count;
+  char *strings;
+  enum bfd_link_strip strip;
+  enum bfd_link_discard discard;
+  struct external_nlist *outsym;
+  bfd_size_type strtab_index;
+  struct external_nlist *sym;
+  struct external_nlist *sym_end;
+  struct aout_link_hash_entry **sym_hash;
+  int *symbol_map;
+  bfd_boolean pass;
+  bfd_boolean skip_next;
+
+  output_bfd = finfo->output_bfd;
+  sym_count = obj_aout_external_sym_count (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  strip = finfo->info->strip;
+  discard = finfo->info->discard;
+  outsym = finfo->output_syms;
+
+  /* First write out a symbol for this object file, unless we are
+     discarding such symbols.  */
+  if (strip != strip_all
+      && (strip != strip_some
+	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
+			      FALSE, FALSE) != NULL)
+      && discard != discard_all)
+    {
+      H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
+      H_PUT_8 (output_bfd, 0, outsym->e_other);
+      H_PUT_16 (output_bfd, 0, outsym->e_desc);
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       input_bfd->filename, FALSE);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd,
+		(bfd_get_section_vma (output_bfd,
+				      obj_textsec (input_bfd)->output_section)
+		 + obj_textsec (input_bfd)->output_offset),
+		outsym->e_value);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
+    }
+
+  pass = FALSE;
+  skip_next = FALSE;
+  sym = obj_aout_external_syms (input_bfd);
+  sym_end = sym + sym_count;
+  sym_hash = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+  memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
+  for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
+    {
+      const char *name;
+      int type;
       struct aout_link_hash_entry *h;
+      bfd_boolean skip;
+      asection *symsec;
+      bfd_vma val = 0;
+      bfd_boolean copy;
 
-      BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
-      r_extern = 1;
-      h = ((struct aout_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
-					 pr->u.name, FALSE, FALSE, TRUE));
-      if (h != (struct aout_link_hash_entry *) NULL
-	  && h->indx >= 0)
-	r_index = h->indx;
-      else if (h != NULL)
+      /* We set *symbol_map to 0 above for all symbols.  If it has
+         already been set to -1 for this symbol, it means that we are
+         discarding it because it appears in a duplicate header file.
+         See the N_BINCL code below.  */
+      if (*symbol_map == -1)
+	continue;
+
+      /* Initialize *symbol_map to -1, which means that the symbol was
+         not copied into the output file.  We will change it later if
+         we do copy the symbol over.  */
+      *symbol_map = -1;
+
+      type = H_GET_8 (input_bfd, sym->e_type);
+      name = strings + GET_WORD (input_bfd, sym->e_strx);
+
+      h = NULL;
+
+      if (pass)
 	{
-	  /* We decided to strip this symbol, but it turns out that we
-	     can't.  Note that we lose the other and desc information
-	     here.  I don't think that will ever matter for a global
+	  /* Pass this symbol through.  It is the target of an
+	     indirect or warning symbol.  */
+	  val = GET_WORD (input_bfd, sym->e_value);
+	  pass = FALSE;
+	}
+      else if (skip_next)
+	{
+	  /* Skip this symbol, which is the target of an indirect
+	     symbol that we have changed to no longer be an indirect
 	     symbol.  */
-	  h->indx = -2;
-	  h->written = FALSE;
-	  if (! aout_link_write_other_symbol (h, (PTR) finfo))
-	    return FALSE;
-	  r_index = h->indx;
+	  skip_next = FALSE;
+	  continue;
 	}
       else
 	{
-	  if (! ((*finfo->info->callbacks->unattached_reloc)
-		 (finfo->info, pr->u.name, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    return FALSE;
-	  r_index = 0;
+	  struct aout_link_hash_entry *hresolve;
+
+	  /* We have saved the hash table entry for this symbol, if
+	     there is one.  Note that we could just look it up again
+	     in the hash table, provided we first check that it is an
+	     external symbol.  */
+	  h = *sym_hash;
+
+	  /* Use the name from the hash table, in case the symbol was
+             wrapped.  */
+	  if (h != NULL
+	      && h->root.type != bfd_link_hash_warning)
+	    name = h->root.root.string;
+
+	  /* If this is an indirect or warning symbol, then change
+	     hresolve to the base symbol.  We also change *sym_hash so
+	     that the relocation routines relocate against the real
+	     symbol.  */
+	  hresolve = h;
+	  if (h != (struct aout_link_hash_entry *) NULL
+	      && (h->root.type == bfd_link_hash_indirect
+		  || h->root.type == bfd_link_hash_warning))
+	    {
+	      hresolve = (struct aout_link_hash_entry *) h->root.u.i.link;
+	      while (hresolve->root.type == bfd_link_hash_indirect
+		     || hresolve->root.type == bfd_link_hash_warning)
+		hresolve = ((struct aout_link_hash_entry *)
+			    hresolve->root.u.i.link);
+	      *sym_hash = hresolve;
+	    }
+
+	  /* If the symbol has already been written out, skip it.  */
+	  if (h != NULL
+	      && h->written)
+	    {
+	      if ((type & N_TYPE) == N_INDR
+		  || type == N_WARNING)
+		skip_next = TRUE;
+	      *symbol_map = h->indx;
+	      continue;
+	    }
+
+	  /* See if we are stripping this symbol.  */
+	  skip = FALSE;
+	  switch (strip)
+	    {
+	    case strip_none:
+	      break;
+	    case strip_debugger:
+	      if ((type & N_STAB) != 0)
+		skip = TRUE;
+	      break;
+	    case strip_some:
+	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
+		  == NULL)
+		skip = TRUE;
+	      break;
+	    case strip_all:
+	      skip = TRUE;
+	      break;
+	    }
+	  if (skip)
+	    {
+	      if (h != NULL)
+		h->written = TRUE;
+	      continue;
+	    }
+
+	  /* Get the value of the symbol.  */
+	  if ((type & N_TYPE) == N_TEXT
+	      || type == N_WEAKT)
+	    symsec = obj_textsec (input_bfd);
+	  else if ((type & N_TYPE) == N_DATA
+		   || type == N_WEAKD)
+	    symsec = obj_datasec (input_bfd);
+	  else if ((type & N_TYPE) == N_BSS
+		   || type == N_WEAKB)
+	    symsec = obj_bsssec (input_bfd);
+	  else if ((type & N_TYPE) == N_ABS
+		   || type == N_WEAKA)
+	    symsec = bfd_abs_section_ptr;
+	  else if (((type & N_TYPE) == N_INDR
+		    && (hresolve == NULL
+			|| (hresolve->root.type != bfd_link_hash_defined
+			    && hresolve->root.type != bfd_link_hash_defweak
+			    && hresolve->root.type != bfd_link_hash_common)))
+		   || type == N_WARNING)
+	    {
+	      /* Pass the next symbol through unchanged.  The
+		 condition above for indirect symbols is so that if
+		 the indirect symbol was defined, we output it with
+		 the correct definition so the debugger will
+		 understand it.  */
+	      pass = TRUE;
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else if ((type & N_STAB) != 0)
+	    {
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else
+	    {
+	      /* If we get here with an indirect symbol, it means that
+		 we are outputting it with a real definition.  In such
+		 a case we do not want to output the next symbol,
+		 which is the target of the indirection.  */
+	      if ((type & N_TYPE) == N_INDR)
+		skip_next = TRUE;
+
+	      symsec = NULL;
+
+	      /* We need to get the value from the hash table.  We use
+		 hresolve so that if we have defined an indirect
+		 symbol we output the final definition.  */
+	      if (h == NULL)
+		{
+		  switch (type & N_TYPE)
+		    {
+		    case N_SETT:
+		      symsec = obj_textsec (input_bfd);
+		      break;
+		    case N_SETD:
+		      symsec = obj_datasec (input_bfd);
+		      break;
+		    case N_SETB:
+		      symsec = obj_bsssec (input_bfd);
+		      break;
+		    case N_SETA:
+		      symsec = bfd_abs_section_ptr;
+		      break;
+		    default:
+		      val = 0;
+		      break;
+		    }
+		}
+	      else if (hresolve->root.type == bfd_link_hash_defined
+		       || hresolve->root.type == bfd_link_hash_defweak)
+		{
+		  asection *input_section;
+		  asection *output_section;
+
+		  /* This case usually means a common symbol which was
+		     turned into a defined symbol.  */
+		  input_section = hresolve->root.u.def.section;
+		  output_section = input_section->output_section;
+		  BFD_ASSERT (bfd_is_abs_section (output_section)
+			      || output_section->owner == output_bfd);
+		  val = (hresolve->root.u.def.value
+			 + bfd_get_section_vma (output_bfd, output_section)
+			 + input_section->output_offset);
+
+		  /* Get the correct type based on the section.  If
+		     this is a constructed set, force it to be
+		     globally visible.  */
+		  if (type == N_SETT
+		      || type == N_SETD
+		      || type == N_SETB
+		      || type == N_SETA)
+		    type |= N_EXT;
+
+		  type &=~ N_TYPE;
+
+		  if (output_section == obj_textsec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_TEXT
+			     : N_WEAKT);
+		  else if (output_section == obj_datasec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_DATA
+			     : N_WEAKD);
+		  else if (output_section == obj_bsssec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_BSS
+			     : N_WEAKB);
+		  else
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_ABS
+			     : N_WEAKA);
+		}
+	      else if (hresolve->root.type == bfd_link_hash_common)
+		val = hresolve->root.u.c.size;
+	      else if (hresolve->root.type == bfd_link_hash_undefweak)
+		{
+		  val = 0;
+		  type = N_WEAKU;
+		}
+	      else
+		val = 0;
+	    }
+	  if (symsec != NULL)
+	    val = (symsec->output_section->vma
+		   + symsec->output_offset
+		   + (GET_WORD (input_bfd, sym->e_value)
+		      - symsec->vma));
+
+	  /* If this is a global symbol set the written flag, and if
+	     it is a local symbol see if we should discard it.  */
+	  if (h != NULL)
+	    {
+	      h->written = TRUE;
+	      h->indx = obj_aout_external_sym_count (output_bfd);
+	    }
+	  else if ((type & N_TYPE) != N_SETT
+		   && (type & N_TYPE) != N_SETD
+		   && (type & N_TYPE) != N_SETB
+		   && (type & N_TYPE) != N_SETA)
+	    {
+	      switch (discard)
+		{
+		case discard_none:
+		case discard_sec_merge:
+		  break;
+		case discard_l:
+		  if ((type & N_STAB) == 0
+		      && bfd_is_local_label_name (input_bfd, name))
+		    skip = TRUE;
+		  break;
+		case discard_all:
+		  skip = TRUE;
+		  break;
+		}
+	      if (skip)
+		{
+		  pass = FALSE;
+		  continue;
+		}
+	    }
+
+	  /* An N_BINCL symbol indicates the start of the stabs
+	     entries for a header file.  We need to scan ahead to the
+	     next N_EINCL symbol, ignoring nesting, adding up all the
+	     characters in the symbol names, not including the file
+	     numbers in types (the first number after an open
+	     parenthesis).  */
+	  if (type == (int) N_BINCL)
+	    {
+	      struct external_nlist *incl_sym;
+	      int nest;
+	      struct aout_link_includes_entry *incl_entry;
+	      struct aout_link_includes_totals *t;
+
+	      val = 0;
+	      nest = 0;
+	      for (incl_sym = sym + 1; incl_sym < sym_end; incl_sym++)
+		{
+		  int incl_type;
+
+		  incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		  if (incl_type == (int) N_EINCL)
+		    {
+		      if (nest == 0)
+			break;
+		      --nest;
+		    }
+		  else if (incl_type == (int) N_BINCL)
+		    ++nest;
+		  else if (nest == 0)
+		    {
+		      const char *s;
+
+		      s = strings + GET_WORD (input_bfd, incl_sym->e_strx);
+		      for (; *s != '\0'; s++)
+			{
+			  val += *s;
+			  if (*s == '(')
+			    {
+			      /* Skip the file number.  */
+			      ++s;
+			      while (ISDIGIT (*s))
+				++s;
+			      --s;
+			    }
+			}
+		    }
+		}
+
+	      /* If we have already included a header file with the
+                 same value, then replace this one with an N_EXCL
+                 symbol.  */
+	      copy = (bfd_boolean) (! finfo->info->keep_memory);
+	      incl_entry = aout_link_includes_lookup (&finfo->includes,
+						      name, TRUE, copy);
+	      if (incl_entry == NULL)
+		return FALSE;
+	      for (t = incl_entry->totals; t != NULL; t = t->next)
+		if (t->total == val)
+		  break;
+	      if (t == NULL)
+		{
+		  /* This is the first time we have seen this header
+                     file with this set of stabs strings.  */
+		  t = bfd_hash_allocate (&finfo->includes.root,
+					 sizeof *t);
+		  if (t == NULL)
+		    return FALSE;
+		  t->total = val;
+		  t->next = incl_entry->totals;
+		  incl_entry->totals = t;
+		}
+	      else
+		{
+		  int *incl_map;
+
+		  /* This is a duplicate header file.  We must change
+                     it to be an N_EXCL entry, and mark all the
+                     included symbols to prevent outputting them.  */
+		  type = (int) N_EXCL;
+
+		  nest = 0;
+		  for (incl_sym = sym + 1, incl_map = symbol_map + 1;
+		       incl_sym < sym_end;
+		       incl_sym++, incl_map++)
+		    {
+		      int incl_type;
+
+		      incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		      if (incl_type == (int) N_EINCL)
+			{
+			  if (nest == 0)
+			    {
+			      *incl_map = -1;
+			      break;
+			    }
+			  --nest;
+			}
+		      else if (incl_type == (int) N_BINCL)
+			++nest;
+		      else if (nest == 0)
+			*incl_map = -1;
+		    }
+		}
+	    }
 	}
+
+      /* Copy this symbol into the list of symbols we are going to
+	 write out.  */
+      H_PUT_8 (output_bfd, type, outsym->e_type);
+      H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
+      H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
+      copy = FALSE;
+      if (! finfo->info->keep_memory)
+	{
+	  /* name points into a string table which we are going to
+	     free.  If there is a hash table entry, use that string.
+	     Otherwise, copy name into memory.  */
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    copy = TRUE;
+	}
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       name, copy);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd, val, outsym->e_value);
+      *symbol_map = obj_aout_external_sym_count (output_bfd);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
     }
 
-  howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
-  if (howto == 0)
+  /* Write out the output symbols we have just constructed.  */
+  if (outsym > finfo->output_syms)
     {
-      bfd_set_error (bfd_error_bad_value);
-      return FALSE;
+      bfd_size_type outsym_size;
+
+      if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
+	return FALSE;
+      outsym_size = outsym - finfo->output_syms;
+      outsym_size *= EXTERNAL_NLIST_SIZE;
+      if (bfd_bwrite ((void *) finfo->output_syms, outsym_size, output_bfd)
+	  != outsym_size)
+	return FALSE;
+      finfo->symoff += outsym_size;
     }
 
-  if (o == obj_textsec (finfo->output_bfd))
-    reloff_ptr = &finfo->treloff;
-  else if (o == obj_datasec (finfo->output_bfd))
-    reloff_ptr = &finfo->dreloff;
-  else
-    abort ();
+  return TRUE;
+}
 
-  if (obj_reloc_entry_size (finfo->output_bfd) == RELOC_STD_SIZE)
+/* Link an a.out input BFD into the output file.  */
+
+static bfd_boolean
+aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  bfd_size_type sym_count;
+
+  BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
+
+  /* If this is a dynamic object, it may need special handling.  */
+  if ((input_bfd->flags & DYNAMIC) != 0
+      && aout_backend_info (input_bfd)->link_dynamic_object != NULL)
+    return ((*aout_backend_info (input_bfd)->link_dynamic_object)
+	    (finfo->info, input_bfd));
+
+  /* Get the symbols.  We probably have them already, unless
+     finfo->info->keep_memory is FALSE.  */
+  if (! aout_get_external_symbols (input_bfd))
+    return FALSE;
+
+  sym_count = obj_aout_external_sym_count (input_bfd);
+
+  /* Write out the symbols and get a map of the new indices.  The map
+     is placed into finfo->symbol_map.  */
+  if (! aout_link_write_symbols (finfo, input_bfd))
+    return FALSE;
+
+  /* Relocate and write out the sections.  These functions use the
+     symbol map created by aout_link_write_symbols.  The linker_mark
+     field will be set if these sections are to be included in the
+     link, which will normally be the case.  */
+  if (obj_textsec (input_bfd)->linker_mark)
     {
-#ifdef MY_put_reloc
-      MY_put_reloc (finfo->output_bfd, r_extern, r_index, p->offset, howto,
-		    &srel);
-#else
-      {
-	int r_pcrel;
-	int r_baserel;
-	int r_jmptable;
-	int r_relative;
-	int r_length;
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_textsec (input_bfd),
+				     &finfo->treloff,
+				     exec_hdr (input_bfd)->a_trsize))
+	return FALSE;
+    }
+  if (obj_datasec (input_bfd)->linker_mark)
+    {
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_datasec (input_bfd),
+				     &finfo->dreloff,
+				     exec_hdr (input_bfd)->a_drsize))
+	return FALSE;
+    }
 
-	r_pcrel = (int) howto->pc_relative;
-	r_baserel = (howto->type & 8) != 0;
-	r_jmptable = (howto->type & 16) != 0;
-	r_relative = (howto->type & 32) != 0;
-	r_length = howto->size;
+  /* If we are not keeping memory, we don't need the symbols any
+     longer.  We still need them if we are keeping memory, because the
+     strings in the hash table point into them.  */
+  if (! finfo->info->keep_memory)
+    {
+      if (! aout_link_free_symbols (input_bfd))
+	return FALSE;
+    }
 
-	PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
-	if (bfd_header_big_endian (finfo->output_bfd))
-	  {
-	    srel.r_index[0] = r_index >> 16;
-	    srel.r_index[1] = r_index >> 8;
-	    srel.r_index[2] = r_index;
-	    srel.r_type[0] =
-	      ((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
-	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
-	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_BIG : 0)
-	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
-	       | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
-	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-	  }
-	else
-	  {
-	    srel.r_index[2] = r_index >> 16;
-	    srel.r_index[1] = r_index >> 8;
-	    srel.r_index[0] = r_index;
-	    srel.r_type[0] =
-	      ((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
-	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
-	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_LITTLE : 0)
-	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
-	       | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
-	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-	  }
-      }
-#endif
-      rel_ptr = (PTR) &srel;
+  return TRUE;
+}
 
-      /* We have to write the addend into the object file, since
-	 standard a.out relocs are in place.  It would be more
-	 reliable if we had the current contents of the file here,
-	 rather than assuming zeroes, but we can't read the file since
-	 it was opened using bfd_openw.  */
-      if (pr->addend != 0)
-	{
-	  bfd_size_type size;
-	  bfd_reloc_status_type r;
-	  bfd_byte *buf;
-	  bfd_boolean ok;
+/* Do the final link step.  This is called on the output BFD.  The
+   INFO structure should point to a list of BFDs linked through the
+   link_next field which can be used to find each BFD which takes part
+   in the output.  Also, each section in ABFD should point to a list
+   of bfd_link_order structures which list all the input sections for
+   the output section.  */
 
-	  size = bfd_get_reloc_size (howto);
-	  buf = (bfd_byte *) bfd_zmalloc (size);
-	  if (buf == (bfd_byte *) NULL)
-	    return FALSE;
-	  r = MY_relocate_contents (howto, finfo->output_bfd,
-				    (bfd_vma) pr->addend, buf);
-	  switch (r)
+bfd_boolean
+NAME (aout, final_link) (bfd *abfd,
+			 struct bfd_link_info *info,
+			 void (*callback) (bfd *, file_ptr *, file_ptr *, file_ptr *))
+{
+  struct aout_final_link_info aout_info;
+  bfd_boolean includes_hash_initialized = FALSE;
+  bfd *sub;
+  bfd_size_type trsize, drsize;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_relocs_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type text_size;
+  file_ptr text_end;
+  struct bfd_link_order *p;
+  asection *o;
+  bfd_boolean have_link_order_relocs;
+
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
+
+  aout_info.info = info;
+  aout_info.output_bfd = abfd;
+  aout_info.contents = NULL;
+  aout_info.relocs = NULL;
+  aout_info.symbol_map = NULL;
+  aout_info.output_syms = NULL;
+
+  if (! bfd_hash_table_init_n (&aout_info.includes.root,
+			       aout_link_includes_newfunc,
+			       251))
+    goto error_return;
+  includes_hash_initialized = TRUE;
+
+  /* Figure out the largest section size.  Also, if generating
+     relocatable output, count the relocs.  */
+  trsize = 0;
+  drsize = 0;
+  max_contents_size = 0;
+  max_relocs_size = 0;
+  max_sym_count = 0;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      bfd_size_type sz;
+
+      if (info->relocatable)
+	{
+	  if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
 	    {
-	    case bfd_reloc_ok:
-	      break;
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      if (! ((*finfo->info->callbacks->reloc_overflow)
-		     (finfo->info, NULL,
-		      (p->type == bfd_section_reloc_link_order
-		       ? bfd_section_name (finfo->output_bfd,
-					   pr->u.section)
-		       : pr->u.name),
-		      howto->name, pr->addend, (bfd *) NULL,
-		      (asection *) NULL, (bfd_vma) 0)))
-		{
-		  free (buf);
-		  return FALSE;
-		}
-	      break;
+	      trsize += exec_hdr (sub)->a_trsize;
+	      drsize += exec_hdr (sub)->a_drsize;
+	    }
+	  else
+	    {
+	      /* FIXME: We need to identify the .text and .data sections
+		 and call get_reloc_upper_bound and canonicalize_reloc to
+		 work out the number of relocs needed, and then multiply
+		 by the reloc size.  */
+	      (*_bfd_error_handler)
+		(_("%s: relocatable link from %s to %s not supported"),
+		 bfd_get_filename (abfd),
+		 sub->xvec->name, abfd->xvec->name);
+	      bfd_set_error (bfd_error_invalid_operation);
+	      goto error_return;
 	    }
-	  ok = bfd_set_section_contents (finfo->output_bfd, o, (PTR) buf,
-					 (file_ptr) p->offset, size);
-	  free (buf);
-	  if (! ok)
-	    return FALSE;
+	}
+
+      if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+	{
+	  sz = obj_textsec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+	  sz = obj_datasec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+
+	  sz = exec_hdr (sub)->a_trsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+	  sz = exec_hdr (sub)->a_drsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+
+	  sz = obj_aout_external_sym_count (sub);
+	  if (sz > max_sym_count)
+	    max_sym_count = sz;
 	}
     }
-  else
+
+  if (info->relocatable)
     {
-#ifdef MY_put_ext_reloc
-      MY_put_ext_reloc (finfo->output_bfd, r_extern, r_index, p->offset,
-			howto, &erel, pr->addend);
-#else
-      PUT_WORD (finfo->output_bfd, p->offset, erel.r_address);
+      if (obj_textsec (abfd) != NULL)
+	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
+						 ->link_order_head)
+		   * obj_reloc_entry_size (abfd));
+      if (obj_datasec (abfd) != NULL)
+	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
+						 ->link_order_head)
+		   * obj_reloc_entry_size (abfd));
+    }
 
-      if (bfd_header_big_endian (finfo->output_bfd))
+  exec_hdr (abfd)->a_trsize = trsize;
+  exec_hdr (abfd)->a_drsize = drsize;
+
+  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
+
+  /* Adjust the section sizes and vmas according to the magic number.
+     This sets a_text, a_data and a_bss in the exec_hdr and sets the
+     filepos for each section.  */
+  if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+    goto error_return;
+
+  /* The relocation and symbol file positions differ among a.out
+     targets.  We are passed a callback routine from the backend
+     specific code to handle this.
+     FIXME: At this point we do not know how much space the symbol
+     table will require.  This will not work for any (nonstandard)
+     a.out target that needs to know the symbol table size before it
+     can compute the relocation file positions.  This may or may not
+     be the case for the hp300hpux target, for example.  */
+  (*callback) (abfd, &aout_info.treloff, &aout_info.dreloff,
+	       &aout_info.symoff);
+  obj_textsec (abfd)->rel_filepos = aout_info.treloff;
+  obj_datasec (abfd)->rel_filepos = aout_info.dreloff;
+  obj_sym_filepos (abfd) = aout_info.symoff;
+
+  /* We keep a count of the symbols as we output them.  */
+  obj_aout_external_sym_count (abfd) = 0;
+
+  /* We accumulate the string table as we write out the symbols.  */
+  aout_info.strtab = _bfd_stringtab_init ();
+  if (aout_info.strtab == NULL)
+    goto error_return;
+
+  /* Allocate buffers to hold section contents and relocs.  */
+  aout_info.contents = bfd_malloc (max_contents_size);
+  aout_info.relocs = bfd_malloc (max_relocs_size);
+  aout_info.symbol_map = bfd_malloc (max_sym_count * sizeof (int *));
+  aout_info.output_syms = bfd_malloc ((max_sym_count + 1)
+				      * sizeof (struct external_nlist));
+  if ((aout_info.contents == NULL && max_contents_size != 0)
+      || (aout_info.relocs == NULL && max_relocs_size != 0)
+      || (aout_info.symbol_map == NULL && max_sym_count != 0)
+      || aout_info.output_syms == NULL)
+    goto error_return;
+
+  /* If we have a symbol named __DYNAMIC, force it out now.  This is
+     required by SunOS.  Doing this here rather than in sunos.c is a
+     hack, but it's easier than exporting everything which would be
+     needed.  */
+  {
+    struct aout_link_hash_entry *h;
+
+    h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
+			       FALSE, FALSE, FALSE);
+    if (h != NULL)
+      aout_link_write_other_symbol (h, &aout_info);
+  }
+
+  /* The most time efficient way to do the link would be to read all
+     the input object files into memory and then sort out the
+     information into the output file.  Unfortunately, that will
+     probably use too much memory.  Another method would be to step
+     through everything that composes the text section and write it
+     out, and then everything that composes the data section and write
+     it out, and then write out the relocs, and then write out the
+     symbols.  Unfortunately, that requires reading stuff from each
+     input file several times, and we will not be able to keep all the
+     input files open simultaneously, and reopening them will be slow.
+
+     What we do is basically process one input file at a time.  We do
+     everything we need to do with an input file once--copy over the
+     section contents, handle the relocation information, and write
+     out the symbols--and then we throw away the information we read
+     from it.  This approach requires a lot of lseeks of the output
+     file, which is unfortunate but still faster than reopening a lot
+     of files.
+
+     We use the output_has_begun field of the input BFDs to see
+     whether we have already handled it.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    sub->output_has_begun = FALSE;
+
+  /* Mark all sections which are to be included in the link.  This
+     will normally be every section.  We need to do this so that we
+     can identify any sections which the linker has decided to not
+     include.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->link_order_head; p != NULL; p = p->next)
+	if (p->type == bfd_indirect_link_order)
+	  p->u.indirect.section->linker_mark = TRUE;
+    }
+
+  have_link_order_relocs = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->link_order_head;
+	   p != NULL;
+	   p = p->next)
 	{
-	  erel.r_index[0] = r_index >> 16;
-	  erel.r_index[1] = r_index >> 8;
-	  erel.r_index[2] = r_index;
-	  erel.r_type[0] =
-	    ((r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
-	     | (howto->type << RELOC_EXT_BITS_TYPE_SH_BIG));
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour (p->u.indirect.section->owner)
+		  == bfd_target_aout_flavour))
+	    {
+	      bfd *input_bfd;
+
+	      input_bfd = p->u.indirect.section->owner;
+	      if (! input_bfd->output_has_begun)
+		{
+		  if (! aout_link_input_bfd (&aout_info, input_bfd))
+		    goto error_return;
+		  input_bfd->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      /* These are handled below.  */
+	      have_link_order_relocs = TRUE;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
 	}
-      else
+    }
+
+  /* Write out any symbols that we have not already written out.  */
+  aout_link_hash_traverse (aout_hash_table (info),
+			   aout_link_write_other_symbol,
+			   (void *) &aout_info);
+
+  /* Now handle any relocs we were asked to create by the linker.
+     These did not come from any input file.  We must do these after
+     we have written out all the symbols, so that we know the symbol
+     indices to use.  */
+  if (have_link_order_relocs)
+    {
+      for (o = abfd->sections; o != NULL; o = o->next)
 	{
-	  erel.r_index[2] = r_index >> 16;
-	  erel.r_index[1] = r_index >> 8;
-	  erel.r_index[0] = r_index;
-	  erel.r_type[0] =
-	    (r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
-	      | (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
+	  for (p = o->link_order_head;
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (p->type == bfd_section_reloc_link_order
+		  || p->type == bfd_symbol_reloc_link_order)
+		{
+		  if (! aout_link_reloc_link_order (&aout_info, o, p))
+		    goto error_return;
+		}
+	    }
 	}
+    }
 
-      PUT_WORD (finfo->output_bfd, (bfd_vma) pr->addend, erel.r_addend);
-#endif /* MY_put_ext_reloc */
+  if (aout_info.contents != NULL)
+    {
+      free (aout_info.contents);
+      aout_info.contents = NULL;
+    }
+  if (aout_info.relocs != NULL)
+    {
+      free (aout_info.relocs);
+      aout_info.relocs = NULL;
+    }
+  if (aout_info.symbol_map != NULL)
+    {
+      free (aout_info.symbol_map);
+      aout_info.symbol_map = NULL;
+    }
+  if (aout_info.output_syms != NULL)
+    {
+      free (aout_info.output_syms);
+      aout_info.output_syms = NULL;
+    }
+  if (includes_hash_initialized)
+    {
+      bfd_hash_table_free (&aout_info.includes.root);
+      includes_hash_initialized = FALSE;
+    }
 
-      rel_ptr = (PTR) &erel;
+  /* Finish up any dynamic linking we may be doing.  */
+  if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
+    {
+      if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
+	goto error_return;
     }
 
-  amt = obj_reloc_entry_size (finfo->output_bfd);
-  if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
-      || bfd_bwrite (rel_ptr, amt, finfo->output_bfd) != amt)
-    return FALSE;
+  /* Update the header information.  */
+  abfd->symcount = obj_aout_external_sym_count (abfd);
+  exec_hdr (abfd)->a_syms = abfd->symcount * EXTERNAL_NLIST_SIZE;
+  obj_str_filepos (abfd) = obj_sym_filepos (abfd) + exec_hdr (abfd)->a_syms;
+  obj_textsec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
+  obj_datasec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
 
-  *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
+  /* Write out the string table, unless there are no symbols.  */
+  if (abfd->symcount > 0)
+    {
+      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
+	  || ! emit_stringtab (abfd, aout_info.strtab))
+	goto error_return;
+    }
+  else if (obj_textsec (abfd)->reloc_count == 0
+	   && obj_datasec (abfd)->reloc_count == 0)
+    {
+      bfd_byte b;
+      file_ptr pos;
 
-  /* Assert that the relocs have not run into the symbols, and that n
-     the text relocs have not run into the data relocs.  */
-  BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
-	      && (reloff_ptr != &finfo->treloff
-		  || (*reloff_ptr
-		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+      b = 0;
+      pos = obj_datasec (abfd)->filepos + exec_hdr (abfd)->a_data - 1;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+	goto error_return;
+    }
 
   return TRUE;
+
+ error_return:
+  if (aout_info.contents != NULL)
+    free (aout_info.contents);
+  if (aout_info.relocs != NULL)
+    free (aout_info.relocs);
+  if (aout_info.symbol_map != NULL)
+    free (aout_info.symbol_map);
+  if (aout_info.output_syms != NULL)
+    free (aout_info.output_syms);
+  if (includes_hash_initialized)
+    bfd_hash_table_free (&aout_info.includes.root);
+  return FALSE;
 }