* sunos.c: Remove all code that goes in aout.c. Split out

        machine dependent followup in sunos4_object_p into
        sunos4_callback.  Use JUMP_TABLE(aout) and redefine only
        the names we CHANGE, not all the names.  Drop the little-endian
        vector, and rename the vector as sunos4 rather than generic.

1 files changed, 77 insertions, 1404 deletions

diff --git a/bfd/sunos.c b/bfd/sunos.c
index f4e70b0..cde8d8e 100644
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -1,5 +1,4 @@
-/*** bfd backend for sunos binaries */
-/** a.out files */
+/* BFD backend for sunos binaries */
 
 /* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
 
@@ -34,122 +33,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 void (*bfd_error_trap)();
 
+static bfd_target *sunos4_callback ();
+
 /*SUPPRESS558*/
 /*SUPPRESS529*/
 
-#define CTOR_TABLE_RELOC_IDX 2
-static  reloc_howto_type howto_table_ext[] = 
-{
-  HOWTO(RELOC_8,      0,  0,  	8,  false, 0, true,  true,0,"8",      false, 0,0x000000ff, false),
-  HOWTO(RELOC_16,     0,  1, 	16, false, 0, true,  true,0,"16",      false, 0,0x0000ffff, false),
-  HOWTO(RELOC_32,     0,  2, 	32, false, 0, true,  true,0,"32",      false, 0,0xffffffff, false),
-  HOWTO(RELOC_DISP8,  0,  0, 	8,  true,  0, false, true,0,"DISP8", 	false, 0,0x000000ff, false),
-  HOWTO(RELOC_DISP16, 0,  1, 	16, true,  0, false, true,0,"DISP16", 	false, 0,0x0000ffff, false),
-  HOWTO(RELOC_DISP32, 0,  2, 	32, true,  0, false, true,0,"DISP32", 	false, 0,0xffffffff, false),
-  HOWTO(RELOC_WDISP30,2,  2, 	30, true,  0, false, true,0,"WDISP30", 	false, 0,0x3fffffff, false),
-  HOWTO(RELOC_WDISP22,2,  2, 	22, true,  0, false, true,0,"WDISP22", 	false, 0,0x003fffff, false),
-  HOWTO(RELOC_HI22,   10, 2, 	22, false, 0, false, true,0,"HI22",	false, 0,0x003fffff, false),
-  HOWTO(RELOC_22,      0, 2, 	22, false, 0, false, true,0,"22",       false, 0,0x003fffff, false),
-  HOWTO(RELOC_13, 	0, 2, 	13, false, 0, false, true,0,"13",       false, 0,0x00001fff, false),
-  HOWTO(RELOC_LO10, 	0, 2, 	10, false, 0, false, true,0,"LO10",     false, 0,0x000003ff, false),
-  HOWTO(RELOC_SFA_BASE,0, 2, 	32, false, 0, false, true,0,"SFA_BASE", false, 0,0xffffffff, false),
-  HOWTO(RELOC_SFA_OFF13,0,2, 	32, false, 0, false, true,0,"SFA_OFF13",false, 0,0xffffffff, false),
-  HOWTO(RELOC_BASE10, 0,  2, 	16, false, 0, false, true,0,"BASE10",   false, 0,0x0000ffff, false),
-  HOWTO(RELOC_BASE13, 0,  2,	13, false, 0, false, true,0,"BASE13",   false, 0,0x00001fff, false),
-  HOWTO(RELOC_BASE22, 0,  2,	0,  false, 0, false, true,0,"BASE22",   false, 0,0x00000000, false),
-  HOWTO(RELOC_PC10,   0,  2,	10, false, 0, false, true,0,"PC10",	false, 0,0x000003ff, false),
-  HOWTO(RELOC_PC22,   0,  2,	22, false, 0, false, true,0,"PC22",	false, 0,0x003fffff, false),
-  HOWTO(RELOC_JMP_TBL,0,  2,	32, false, 0, false, true,0,"JMP_TBL",	false, 0,0xffffffff, false),
-  HOWTO(RELOC_SEGOFF16,0, 2,	0,  false, 0, false, true,0,"SEGOFF16",	false, 0,0x00000000, false),
-  HOWTO(RELOC_GLOB_DAT,0, 2,	0,  false, 0, false, true,0,"GLOB_DAT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_JMP_SLOT,0, 2,	0,  false, 0, false, true,0,"JMP_SLOT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_RELATIVE,0, 2,	0,  false, 0, false, true,0,"RELATIVE",	false, 0,0x00000000, false),
-  HOWTO(RELOC_JUMPTARG,2, 13,	16, true,  0, false, true,0,"JUMPTARG",	false, 0,0x0000ffff, false),
-  HOWTO(RELOC_CONST,	0, 13,	16, false, 0, false, true,0,"CONST",	false, 0,0x0000ffff, false),
-  HOWTO(RELOC_CONSTH, 16, 13,	16, false, 0, false, true,0,"CONSTH",	false, 0,0x0000ffff, false),
-};
-
-/* Convert standard reloc records to "arelent" format (incl byte swap).  */
-
-static  reloc_howto_type howto_table_std[] = {
-  /* type           rs   size bsz  pcrel bitpos  abs ovrf sf name    part_inpl   readmask  setmask  pcdone */
-HOWTO( 0,	       0,  0,  	8,  false, 0, true,  true,0,"8",	true, 0x000000ff,0x000000ff, false),
-HOWTO( 1,	       0,  1, 	16, false, 0, true,  true,0,"16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO( 2,	       0,  2, 	32, false, 0, true,  true,0,"32",	true, 0xffffffff,0xffffffff, false),
-HOWTO( 3,	       0,  3, 	64, false, 0, true,  true,0,"64",       true, 0xdeaddead,0xdeaddead, false),
-HOWTO( 4,	       0,  0, 	8,  true,  0, false, true,0,"DISP8",    true, 0x000000ff,0x000000ff, false),
-HOWTO( 5,	       0,  1, 	16, true,  0, false, true,0,"DISP16",   true, 0x0000ffff,0x0000ffff, false),
-HOWTO( 6,	       0,  2, 	32, true,  0, false, true,0,"DISP32",   true, 0xffffffff,0xffffffff, false),
-HOWTO( 7,	       0,  3, 	64, true,  0, false, true,0,"DISP64",   true, 0xfeedface,0xfeedface, false),
-};
-
-
-bfd_error_vector_type bfd_error_vector;
-
-PROTO (void , sunos4_write_syms, ());
-PROTO (static boolean,sunos4_squirt_out_relocs,(bfd *abfd, asection *section));
-
-
-static size_t
-reloc_size_func(abfd)
-bfd *abfd;
-{
-  switch (bfd_get_architecture (abfd)) {
-  case bfd_arch_sparc:
-  case bfd_arch_a29k:
-    return  RELOC_EXT_SIZE;
-  default:
-    return  RELOC_STD_SIZE;
-  }
-}
-
-static void
-DEFUN(bfd_aout_swap_exec_header_in,(abfd, raw_bytes, execp),
-      bfd *abfd AND
-      unsigned char *raw_bytes AND
-      struct exec *execp)
-{
-  struct exec_bytes *bytes = (struct exec_bytes *)raw_bytes;
-
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_getlong (abfd, bytes->a_info);
-  execp->a_text   = bfd_h_getlong (abfd, bytes->a_text);
-  execp->a_data   = bfd_h_getlong (abfd, bytes->a_data);
-  execp->a_bss    = bfd_h_getlong (abfd, bytes->a_bss);
-  execp->a_syms   = bfd_h_getlong (abfd, bytes->a_syms);
-  execp->a_entry  = bfd_h_getlong (abfd, bytes->a_entry);
-  execp->a_trsize = bfd_h_getlong (abfd, bytes->a_trsize);
-  execp->a_drsize = bfd_h_getlong (abfd, bytes->a_drsize);
-}
-
-static void
-DEFUN(bfd_aout_swap_exec_header_out,(abfd, execp, raw_bytes),
-     bfd *abfd AND
-     struct exec *execp AND 
-     unsigned char *raw_bytes)
-{
-  struct exec_bytes *bytes = (struct exec_bytes *)raw_bytes;
-
-  /* Now fill in fields in the raw data, from the fields in the exec struct. */
-  bfd_h_putlong (abfd, execp->a_info  , bytes->a_info);
-  bfd_h_putlong (abfd, execp->a_text  , bytes->a_text);
-  bfd_h_putlong (abfd, execp->a_data  , bytes->a_data);
-  bfd_h_putlong (abfd, execp->a_bss   , bytes->a_bss);
-  bfd_h_putlong (abfd, execp->a_syms  , bytes->a_syms);
-  bfd_h_putlong (abfd, execp->a_entry , bytes->a_entry);
-  bfd_h_putlong (abfd, execp->a_trsize, bytes->a_trsize);
-  bfd_h_putlong (abfd, execp->a_drsize, bytes->a_drsize);
-}
-
 bfd_target *
 sunos4_object_p (abfd)
      bfd *abfd;
 {
   unsigned char magicbuf[4];	/* Raw bytes of magic number from file */
   unsigned long magic;		/* Swapped magic number */
-  unsigned char exec_bytes[EXEC_BYTES_SIZE];	/* Raw bytes of exec hdr */
-  struct exec *execp;
-  PTR rawptr;
 
   bfd_error = system_call_error;
 
@@ -160,47 +54,41 @@ sunos4_object_p (abfd)
 
   if (N_BADMAG (*((struct exec *) &magic))) return 0;
 
-  if (bfd_seek (abfd, 0L, false) < 0) return 0;
-
-  if (bfd_read ((PTR) exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    bfd_error = wrong_format;
-    return 0;
-  }
-
-  /* Use an intermediate variable for clarity */
-  rawptr = (PTR) bfd_zalloc (abfd, sizeof (struct sunexdata) + sizeof (struct exec));
+  return some_aout_object_p (abfd, sunos4_callback);
+}
 
-  if (rawptr == NULL) {
-    bfd_error = no_memory;
-    return 0;
-  }
+/* Set parameters about this a.out file that are machine-dependent.
+   This routine is called from some_aout_object_p just before it returns.  */
 
-  set_tdata (abfd, ((struct sunexdata *) rawptr));
-  exec_hdr (abfd) = execp =
-    (struct exec *) ((char *)rawptr + sizeof (struct sunexdata));
+static bfd_target *
+sunos4_callback (abfd)
+     bfd *abfd;
+{
+  struct exec *execp = exec_hdr (abfd);
 
-  bfd_aout_swap_exec_header_in (abfd, exec_bytes, execp);
+  /* The virtual memory addresses of the sections */
+  obj_datasec (abfd)->vma = N_DATADDR(*execp);
+  obj_bsssec (abfd)->vma = N_BSSADDR(*execp);
+  obj_textsec (abfd)->vma = N_TXTADDR(*execp);
 
-  /* Set the file flags */
-  abfd->flags = NO_FLAGS;
-  if (execp->a_drsize || execp->a_trsize)
-    abfd->flags |= HAS_RELOC;
-  if (execp->a_entry) 
-    abfd->flags |= EXEC_P;
-  if (execp->a_syms) 
-    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+  /* The file offsets of the sections */
+  obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF(*execp);
 
+  /* The file offsets of the relocation info */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
 
-  if (N_MAGIC (*execp) == ZMAGIC) abfd->flags |= D_PAGED;
-  if (N_MAGIC (*execp) == NMAGIC) abfd->flags |= WP_TEXT;
+  /* The file offsets of the string table and symbol table.  */
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
 
   /* Determine the architecture and machine type of the object file.  */
-  abfd->obj_arch = bfd_arch_unknown;	/* Default values */
-  abfd->obj_machine = 0;
-  switch (N_MACHTYPE (*execp)) {
+  switch (N_MACHTYPE (*exec_hdr (abfd))) {
 
   case M_UNKNOWN:
+	abfd->obj_arch = bfd_arch_unknown;
+	abfd->obj_machine = 0;
 	break;
 
   case M_68010:
@@ -215,63 +103,33 @@ sunos4_object_p (abfd)
 
   case M_SPARC:
 	abfd->obj_arch = bfd_arch_sparc;
+	abfd->obj_machine = 0;
 	break;
 
   case M_386:
 	abfd->obj_arch = bfd_arch_i386;
+	abfd->obj_machine = 0;
 	break;
 
   case M_29K:
 	abfd->obj_arch = bfd_arch_a29k;
+	abfd->obj_machine = 0;
 	break;
 
   default:
 	abfd->obj_arch = bfd_arch_obscure;
+	abfd->obj_machine = 0;
 	break;
   }
 
-  bfd_get_start_address (abfd) = execp->a_entry;
-
-  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct nlist);
-
-  /* Remember the positions of the string table and symbol table.  */
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-
-  /* create the sections.  This is raunchy, but bfd_close wants to reclaim
-     them */
-  obj_textsec (abfd) = (asection *)NULL;
-  obj_datasec (abfd) = (asection *)NULL;
-  obj_bsssec (abfd) = (asection *)NULL;
-  obj_aout_symbols(abfd) = (aout_symbol_type *)NULL;
-  (void)bfd_make_section(abfd, ".text");
-  (void)bfd_make_section(abfd, ".data");
-  (void)bfd_make_section(abfd, ".bss");
-
-  obj_datasec (abfd)->size = execp->a_data;
-  obj_bsssec (abfd)->size = execp->a_bss;
-  obj_textsec (abfd)->size = execp->a_text;
-  obj_datasec (abfd)->vma = N_DATADDR(*execp);
-  obj_bsssec (abfd)->vma = N_BSSADDR(*execp);
-  obj_textsec (abfd)->vma = N_TXTADDR(*execp);
-
-  obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF(*execp);
-
-  obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
-  obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
-
-  obj_textsec (abfd)->flags = (execp->a_trsize != 0 ?
-                               (SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_HAS_CONTENTS) :
-                               (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS));
-  obj_datasec (abfd)->flags = (execp->a_drsize != 0 ?
-                               (SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_HAS_CONTENTS) :
-                               (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS));
-  obj_bsssec (abfd)->flags = SEC_ALLOC;
-
-  abfd->sections = obj_textsec (abfd);
-  obj_textsec (abfd)->next = obj_datasec (abfd);
-  obj_datasec (abfd)->next = obj_bsssec (abfd);
+  /* Determine the size of a relocation entry, based on the architecture */
+  switch (abfd->obj_arch) {
+  case bfd_arch_sparc:
+  case bfd_arch_a29k:
+    obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+  default:
+    obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+  }
   return abfd->xvec;
 }
 
@@ -285,15 +143,15 @@ sunos4_mkobject (abfd)
   bfd_error = system_call_error;
 
   /* Use an intermediate variable for clarity */
-  rawptr = bfd_zalloc (abfd, sizeof (struct sunexdata) + sizeof (struct exec));
+  rawptr = bfd_zalloc (abfd, sizeof (struct aoutdata) + sizeof (struct exec));
 
   if (rawptr == NULL) {
     bfd_error = no_memory;
     return false;
   }
 
-  set_tdata (abfd, (struct sunexdata *) rawptr);
-  exec_hdr (abfd) = (struct exec *) (rawptr + sizeof (struct sunexdata));
+  set_tdata (abfd, (struct aoutdata *) rawptr);
+  exec_hdr (abfd) = (struct exec *) (rawptr + sizeof (struct aoutdata));
 
   /* For simplicity's sake we just make all the sections right here. */
 
@@ -353,19 +211,9 @@ aout_machine_type (arch, machine)
   return arch_flags;
 }
 
-boolean
-sunos4_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  abfd->obj_arch = arch;
-  abfd->obj_machine = machine;
-  if (arch != bfd_arch_unknown &&
-      aout_machine_type (arch, machine) == M_UNKNOWN)
-    return false;		/* We can't represent this type */
-  return true;			/* We're easy ... */
-}
+/* Write an object file in SunOS format.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
 
 boolean
 sunos4_write_object_contents (abfd)
@@ -435,10 +283,10 @@ sunos4_write_object_contents (abfd)
   execp->a_entry = bfd_get_start_address (abfd);
 
   execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *
-		     reloc_size_func(abfd));
+		     obj_reloc_entry_size (abfd));
 		       
   execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *
-		     reloc_size_func(abfd));
+		     obj_reloc_entry_size (abfd));
 
   bfd_aout_swap_exec_header_out (abfd, execp, exec_bytes);
 
@@ -452,14 +300,14 @@ sunos4_write_object_contents (abfd)
       bfd_seek (abfd,
 		(long)(N_SYMOFF(*execp)), false);
 
-      sunos4_write_syms (abfd);
+      aout_write_syms (abfd);
 
       bfd_seek (abfd,	(long)(N_TRELOFF(*execp)), false);
 
-      if (!sunos4_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
+      if (!aout_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
       bfd_seek (abfd, (long)(N_DRELOFF(*execp)), false);
 
-      if (!sunos4_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
+      if (!aout_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
     }
   return true;
 }
@@ -509,7 +357,7 @@ struct regs {
 struct core {
   int c_magic;			/* Corefile magic number */
   int c_len;			/* Sizeof (struct core) */
-  struct regs c_regs;		/* General purpose registers */
+  struct regs c_regs;		/* General purpose registers -- MACHDEP SIZE */
   struct exec c_aouthdr;	/* A.out header */
   int c_signo;			/* Killing signal, if any */
   int c_tsize;			/* Text size (bytes) */
@@ -715,1179 +563,27 @@ swapcore (abfd, core)
   /* Leave "c_ucode" unswapped for now, since we can't find it easily.  */
 }
 
-/** exec and core file sections */
-
-boolean
-sunos4_new_section_hook (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
-{
-  /* align to double at least */
-  newsect->alignment_power = 3;
-
-  if (bfd_get_format (abfd) == bfd_object) {
-    if (obj_textsec(abfd) == NULL && !strcmp(newsect->name, ".text")) {
-      obj_textsec(abfd)= newsect;
-      return true;
-    }
-
-    if (obj_datasec(abfd) == NULL && !strcmp(newsect->name, ".data")) {
-      obj_datasec(abfd) = newsect;
-      return true;
-    }
-
-    if (obj_bsssec(abfd) == NULL && !strcmp(newsect->name, ".bss")) {
-      obj_bsssec(abfd) = newsect;
-      return true;
-    }
-  }
-
-  /* We allow more than three sections internally */
-  return true;
-}
-
-boolean
-sunos4_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     unsigned char *location;
-     file_ptr offset;
-      int count;
-{
-  if (abfd->output_has_begun == false)
-      {				/* set by bfd.c handler */
-	if ((obj_textsec (abfd) == NULL) || (obj_datasec (abfd) == NULL)) 
-	    {
-	      bfd_error = invalid_operation;
-	      return false;
-	    }
-
-	obj_textsec(abfd)->filepos = sizeof(struct exec);
-	obj_textsec(abfd)->size = align_power(obj_textsec(abfd)->size,
-					      obj_textsec(abfd)->alignment_power);
-	obj_datasec(abfd)->filepos = obj_textsec (abfd)->filepos  + obj_textsec (abfd)->size;
-	obj_datasec(abfd)->size = align_power(obj_datasec(abfd)->size,
-					      obj_datasec(abfd)->alignment_power);
-
-      }
-  /* regardless, once we know what we're doing, we might as well get going */
-  if (section != obj_bsssec(abfd)) {
-    bfd_seek (abfd, section->filepos + offset, SEEK_SET);
-
-    if (count) {
-      return (bfd_write ((PTR)location, 1, count, abfd) == count) ?
-	true : false;
-    }
-    return false;
-  }
-  return true;
-}
-
-boolean
-sunos4_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     int count;
-{
-  if (count) {
-    if (offset >= section->size) return false;
-
-    bfd_seek (abfd, section->filepos + offset, SEEK_SET);
-
-    return (bfd_read (location, 1, count, abfd) == count) ? true:false;
-  }
-  else return true;
-}
-
-
-/* Classify stabs symbols */
-
-
-#define sym_in_text_section(sym) \
-     (((sym)->n_type  & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_TEXT)
-
-#define sym_in_data_section(sym) \
-     (((sym)->n_type  & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_DATA)
-
-#define sym_in_bss_section(sym) \
-     (((sym)->n_type  & (N_ABS | N_TEXT | N_DATA | N_BSS))== N_BSS)
-
-/* Symbol is undefined if type is N_UNDF|N_EXT and if it has
-   zero in the "value" field.  Nonzeroes there are fortrancommon
-   symbols.  */
-#define sym_is_undefined(sym) \
-        ((sym)->n_type == (N_UNDF | N_EXT) && (sym)->n_value == 0)
-
-/* Symbol is a global definition if N_EXT is on and if it has
-   a nonzero type field.  */
-#define sym_is_global_defn(sym) \
-        (((sym)->n_type & N_EXT) && (sym)->n_type & N_TYPE)
-
-/* Symbol is debugger info if any bits outside N_TYPE or N_EXT
-   are on.  */
-#define sym_is_debugger_info(sym) \
-        ((sym)->n_type & ~(N_EXT | N_TYPE))
-
-#define sym_is_fortrancommon(sym)       \
-        (((sym)->n_type == (N_EXT)) && (sym)->n_value != 0)
-
-/* Symbol is absolute if it has N_ABS set */
-#define sym_is_absolute(sym) \
- 	       (((sym)->n_type  & N_TYPE)== N_ABS)
-
-
-#define sym_is_indirect(sym) \
-	       (((sym)->n_type  & N_ABS)== N_ABS)
-
-/* Only in their own functions for ease of debugging; when sym flags have
-   stabilised these should be inlined into their (single) caller */
-
-static void
-translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd)
-     struct nlist *sym_pointer;
-     aout_symbol_type *cache_ptr;
-     bfd *abfd;
-{
-  switch (cache_ptr->type & N_TYPE) {
-  case N_SETA:
-  case N_SETT:
-  case N_SETD:
-  case N_SETB:
-    {
-      asection *section = bfd_make_section(abfd,
-					   cache_ptr->symbol.name);
-      arelent_chain *reloc = (arelent_chain *)bfd_alloc(abfd, sizeof(arelent_chain));
-
-      switch ( (cache_ptr->type  & N_TYPE) ) {
-      case N_SETA:
-	reloc->relent.section =  (asection *)NULL;
-	cache_ptr->symbol.section = (asection *)NULL;
-	break;
-      case N_SETT:
-	reloc->relent.section = (asection *)obj_textsec(abfd);
-	cache_ptr->symbol.value -= reloc->relent.section->vma;
-	break;
-      case N_SETD:
-	reloc->relent.section = (asection *)obj_datasec(abfd);
-	cache_ptr->symbol.value -= reloc->relent.section->vma;
-	break;
-      case N_SETB:
-	reloc->relent.section = (asection *)obj_bsssec(abfd);
-	cache_ptr->symbol.value -= reloc->relent.section->vma;
-	break;
-      }
-      cache_ptr->symbol.section = reloc->relent.section;
-      reloc->relent.addend = cache_ptr->symbol.value ;
-
-      /* We modify the symbol to belong to a section depending upon the
-	 name of the symbol - probably __CTOR__ or __DTOR__ but we don't
-	 really care, and add to the size of the section to contain a
-	 pointer to the symbol. Build a reloc entry to relocate to this
-	 symbol attached to this section.  */
-
-      section->flags = SEC_CONSTRUCTOR;
-      section->reloc_count++;
-      section->alignment_power = 2;
-      reloc->relent.sym_ptr_ptr = (asymbol **)NULL;
-      reloc->next = section->constructor_chain;
-      section->constructor_chain = reloc;
-      reloc->relent.address = section->size;
-      section->size += sizeof(int *);
-
-      reloc->relent.howto = howto_table_ext +CTOR_TABLE_RELOC_IDX;
-      cache_ptr->symbol.flags |=  BSF_DEBUGGING ;
-      }
-    break;
-  default:
-
-    if (sym_is_debugger_info (sym_pointer)) {
-      cache_ptr->symbol.flags = BSF_DEBUGGING ;
-      /* Work out the section correct for this symbol */
-      switch (sym_pointer->n_type & N_TYPE) 
-	{
-	case N_TEXT:
-	case N_FN:
-	  cache_ptr->symbol.section = obj_textsec (abfd);
-	  cache_ptr->symbol.value -= obj_textsec(abfd)->vma;
-	  break;
-	case N_DATA:
-	  cache_ptr->symbol.value  -= obj_datasec(abfd)->vma;
-	  cache_ptr->symbol.section = obj_datasec (abfd);
-	  break;
-	case N_BSS :
-	  cache_ptr->symbol.section = obj_bsssec (abfd);
-	  cache_ptr->symbol.value -= obj_bsssec(abfd)->vma;
-	  break;
-	case N_ABS:
-	default:
-	  cache_ptr->symbol.section = 0;
-	  break;
-	}
-    }
-    else {
-      if (sym_is_fortrancommon (sym_pointer))
-	{
-	  cache_ptr->symbol.flags = BSF_FORT_COMM;
-	  cache_ptr->symbol.section = (asection *)NULL;
-	}
-      else {
-	if (sym_is_undefined (sym_pointer)) {
-	  cache_ptr->symbol.flags = BSF_UNDEFINED;
-	}
-	else if (sym_is_global_defn (sym_pointer)) {
-	  cache_ptr->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
-	}
-
-	else if (sym_is_absolute (sym_pointer)) {
-	  cache_ptr->symbol.flags = BSF_ABSOLUTE;
-	}
-	else {
-	  cache_ptr->symbol.flags = BSF_LOCAL;
-	}
-
-	/* In a.out, the value of a symbol is always relative to the 
-	 * start of the file, if this is a data symbol we'll subtract
-	 * the size of the text section to get the section relative
-	 * value. If this is a bss symbol (which would be strange)
-	 * we'll subtract the size of the previous two sections
-	 * to find the section relative address.
-	 */
-
-	if (sym_in_text_section (sym_pointer))   {
-	  cache_ptr->symbol.value -= obj_textsec(abfd)->vma;
-	  cache_ptr->symbol.section = obj_textsec (abfd);
-	}
-	else if (sym_in_data_section (sym_pointer)){
-	  cache_ptr->symbol.value -= obj_datasec(abfd)->vma;
-	  cache_ptr->symbol.section = obj_datasec (abfd);
-	}
-	else if (sym_in_bss_section(sym_pointer)) {
-	  cache_ptr->symbol.section = obj_bsssec (abfd);
-	  cache_ptr->symbol.value -= obj_bsssec(abfd)->vma;
-	}
-	else {
-	  cache_ptr->symbol.section = (asection *)NULL;
-	  cache_ptr->symbol.flags |= BSF_ABSOLUTE;
-	}
-      }
-    }
-  }
-}
-
-void
-translate_to_native_sym_flags (sym_pointer, cache_ptr_g, abfd)
-     struct nlist *sym_pointer;
-     PTR cache_ptr_g;
-     bfd *abfd;
-{
-  asymbol *cache_ptr = (asymbol *)cache_ptr_g;
-
-  /* FIXME check for writing bss */
-  if (bfd_get_section(cache_ptr)) {
-    if (bfd_get_output_section(cache_ptr) == obj_bsssec (abfd)) {
-      sym_pointer->n_type |= N_BSS;
-    }
-    else if (bfd_get_output_section(cache_ptr) == obj_datasec (abfd)) {
-      sym_pointer->n_type |= N_DATA;
-    }
-    else  if (bfd_get_output_section(cache_ptr) == obj_textsec (abfd)) {
-      sym_pointer->n_type |= N_TEXT;
-    }
-    else {
-      bfd_error_vector.nonrepresentable_section(abfd,
-				 bfd_get_output_section(cache_ptr)->name);
-    }
-    /* Turn the symbol from section relative to absolute again */
-    sym_pointer->n_value +=
-      cache_ptr->section->output_section->vma 
-	+ cache_ptr->section->output_offset ;
-  }
-  else {
-    sym_pointer->n_type |= N_ABS;
-  }
-
-  if (cache_ptr->flags & (BSF_FORT_COMM | BSF_UNDEFINED)) {
-    sym_pointer->n_type = (N_UNDF | N_EXT);
-    return;
-  }
-
-  if (cache_ptr->flags & BSF_ABSOLUTE) {
-    sym_pointer->n_type |= N_ABS;
-  }
-
-  if (cache_ptr->flags & (BSF_GLOBAL | BSF_EXPORT)) {
-    sym_pointer->n_type |= N_EXT;
-  }
-  if (cache_ptr->flags & BSF_DEBUGGING) {
-    sym_pointer->n_type = ((aout_symbol_type *)cache_ptr)->type;
-  }
-}
-
-/* Native-level interface to symbols. */
-
-/* We read the symbols into a buffer, which is discarded when this
-   function exits.  We read the strings into a buffer large enough to
-   hold them all plus all the cached symbol entries. */
-
-asymbol *
-sunos4_make_empty_symbol (abfd)
-bfd *abfd;
-{
-  aout_symbol_type  *new =
-    (aout_symbol_type *)bfd_zalloc (abfd, sizeof (aout_symbol_type));
-  new->symbol.the_bfd = abfd;
-
-  return &new->symbol;
-}
-
-boolean
-DEFUN(sunos4_slurp_symbol_table, (abfd),
-      bfd *abfd)
-{
-  size_t symbol_size;
-  size_t string_size;
-  unsigned char string_chars[LONG_SIZE];
-  struct nlist *syms;
-  char *strings;
-  aout_symbol_type *cached;
-
-  /* If there's no work to be done, don't do any */
-  if (obj_aout_symbols (abfd) != (aout_symbol_type *)NULL) return true;
-  symbol_size = exec_hdr(abfd)->a_syms;
-  if (symbol_size == 0) {
-    bfd_error = no_symbols;
-    return false;
-  }
-
-  bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET);
-  if (bfd_read ((PTR)string_chars, LONG_SIZE, 1, abfd) != LONG_SIZE)
-    return false;
-  string_size = bfd_h_getlong (abfd, string_chars);
-
-  strings = bfd_alloc(abfd, string_size + 1);
-  cached = (aout_symbol_type *)
-	   bfd_zalloc(abfd, bfd_get_symcount (abfd) * sizeof(aout_symbol_type));
-  /* Alloc this last, so we can free it if obstack is in use.  */
-  syms = (struct nlist *) bfd_alloc(abfd, symbol_size);
-
-  bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET);
-  if (bfd_read ((PTR)syms, 1, symbol_size, abfd) != symbol_size) {
-  bailout:
-    if (syms) 	bfd_release (abfd, syms);
-    if (cached)	bfd_release (abfd, cached);
-    if (strings)bfd_release (abfd, strings);
-    return false;
-  }
-
-  bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET);
-  if (bfd_read ((PTR)strings, 1, string_size, abfd) != string_size) {
-    goto bailout;
-  }
-
-  /* OK, now walk the new symtable, cacheing symbol properties */
-    {
-      register struct nlist *sym_pointer;
-      register struct nlist *sym_end = syms + bfd_get_symcount (abfd);
-      register aout_symbol_type *cache_ptr = cached;
-
-      /* run through the table and byte swap if needed */
-      for (sym_pointer = syms; sym_pointer < sym_end;  sym_pointer++) {
-        sym_pointer->n_un.n_strx =
-	  bfd_h_get_x (abfd, &sym_pointer->n_un.n_strx);
-        sym_pointer->n_desc =
-	  bfd_h_get_x (abfd, &sym_pointer->n_desc);
-        sym_pointer->n_value =
-	  bfd_h_get_x (abfd, &sym_pointer->n_value);
-	sym_pointer->n_other = (char)
-	  bfd_h_get_x(abfd, &sym_pointer->n_other);
-	sym_pointer->n_type = (char)
-	  bfd_h_get_x(abfd, &sym_pointer->n_type);
-      }
-
-      /* Run through table and copy values */
-      for (sym_pointer = syms, cache_ptr = cached;
-	   sym_pointer < sym_end; sym_pointer++, cache_ptr++) 
-	  {
-	    cache_ptr->symbol.the_bfd = abfd;
-	    if (sym_pointer->n_un.n_strx)
-	      cache_ptr->symbol.name = sym_pointer->n_un.n_strx + strings;
-	    else
-	      cache_ptr->symbol.name = (char *)NULL;
-	    cache_ptr->symbol.value = sym_pointer->n_value;
-	    cache_ptr->desc = sym_pointer->n_desc;
-	    cache_ptr->other = sym_pointer->n_other;
-	    cache_ptr->type = sym_pointer->n_type;
-	    cache_ptr->symbol.udata = 0;
-	    translate_from_native_sym_flags (sym_pointer, cache_ptr, abfd);
-
-	  }
-    }
-
-  obj_aout_symbols (abfd) =  cached;
-  bfd_release (abfd, (PTR)syms);
-
-  return true;
-}
-
-
-void
-DEFUN(sunos4_write_syms,(abfd),
-     bfd *abfd)
-{
-  unsigned int count ;
-  asymbol **generic = bfd_get_outsymbols (abfd);
-
-  unsigned int stindex = sizeof(stindex); /* initial string length */
-
-  for (count = 0; count < bfd_get_symcount (abfd); count++) {
-    asymbol *g = generic[count];
-    struct nlist nsp;
-
-    if (g->name) {
-      unsigned int length = strlen(g->name) +1;
-      bfd_h_putlong  (abfd, stindex, (unsigned char *)&nsp.n_un.n_strx);
-      stindex += length;
-    }
-    else {
-      bfd_h_putlong  (abfd, 0, (unsigned char *)&nsp.n_un.n_strx);
-    }
-
-    if (g->the_bfd->xvec->flavour == abfd->xvec->flavour) 
-      {
-	nsp.n_desc = aout_symbol( g)->desc;
-	nsp.n_other = aout_symbol(g)->other;
-	nsp.n_type = aout_symbol(g)->type;
-      }
-    else
-      {
-	nsp.n_desc = 0;
-	nsp.n_other = 0;
-	nsp.n_type = 0;
-      }
-
-
-    nsp.n_value = g->value;
-    translate_to_native_sym_flags (&nsp, (PTR)g, abfd);
-
-
-    bfd_h_putshort (abfd, nsp.n_desc, (unsigned char *)&nsp.n_desc);
-    bfd_h_putlong  (abfd, nsp.n_value, (unsigned char *)&nsp.n_value);
-    bfd_write((PTR)&nsp,1, sizeof(nsp), abfd);
-  }
-
-
-  /* Now output the strings.  Be sure to put string length into correct
-   * byte ordering before writing it.
-   */
-  bfd_h_putlong  (abfd, stindex, (unsigned char *)&stindex);
-
-  bfd_write((PTR)&stindex, 1, sizeof(stindex), abfd);
-  
-  generic = bfd_get_outsymbols(abfd);
-  for (count = 0; count < bfd_get_symcount(abfd); count++) 
-    {
-      asymbol *g = *(generic++);
-
-      if (g->name)
-	{
-	  size_t length = strlen(g->name)+1;
-	  bfd_write((PTR)g->name, 1, length, abfd);
-	}
-      if ((g->flags & BSF_FAKE)==0) {
-	g->name = itos(count);	/* smash the generic symbol */
-      }
-    }
-}
-
-
-void
-DEFUN(sunos4_reclaim_symbol_table,(abfd),
-     bfd *abfd)
-{
-
-}
-
-unsigned int
-sunos4_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  if (!sunos4_slurp_symbol_table (abfd)) return 0;
-
-  return (bfd_get_symcount (abfd)+1) * (sizeof (aout_symbol_type *));
-}
-
-unsigned int
-sunos4_get_symtab (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-  unsigned int counter = 0;
-  aout_symbol_type *symbase;
-
-  if (!sunos4_slurp_symbol_table (abfd)) return 0;
-
-  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. */
-
-void
-swap_std_reloc_out (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;		/* Generic relocation struct */
-     struct reloc_std_bytes *natptr;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  unsigned int r_addend;
-
-  bfd_h_putlong (abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ; /* Size as a power of two */
-  r_pcrel  = (int) g->howto->pc_relative;	/* Relative to PC? */
-  /* r_baserel, r_jmptable, r_relative???  FIXME-soon */
-  r_baserel = 0;
-  r_jmptable = 0;
-  r_relative = 0;
-
-  r_addend = g->addend;	/* Start here, see how it goes */
-
-  /* name was clobbered by sunos4_write_syms to be symbol index */
-
-  if (g->sym_ptr_ptr != NULL) 
-    {
-      if ((*(g->sym_ptr_ptr))->section) {
-	/* put the section offset into the addend for output */
-	r_addend += (*(g->sym_ptr_ptr))->section->vma;
-      }
-
-      r_index = stoi((*(g->sym_ptr_ptr))->name);
-      r_extern = 1;
-    }
-  else {
-    r_extern = 0;
-    if (g->section == NULL) {
-      /* It is possible to have a reloc with nothing, we generate an
-	 abs + 0 */
-      r_addend = 0;
-      r_index = N_ABS | N_EXT;
-    }
-    else  if(g->section->output_section == obj_textsec(abfd)) {
-      r_index = N_TEXT | N_EXT;
-      r_addend += g->section->output_section->vma;
-    }
-    else if (g->section->output_section == obj_datasec(abfd)) {
-      r_index = N_DATA | N_EXT;
-      r_addend += g->section->output_section->vma;
-    }
-    else if (g->section->output_section == obj_bsssec(abfd)) {
-      r_index = N_BSS | N_EXT ;
-      r_addend += g->section->output_section->vma;
-    }
-    else {
-      BFD_ASSERT(0);
-    }
-  }
-
-  /* now the fun stuff */
-  if (abfd->xvec->header_byteorder_big_p != false) {
-    natptr->r_index[0] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[2] = r_index;
-    natptr->r_bits[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 {
-    natptr->r_index[2] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[0] = r_index;
-    natptr->r_bits[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);
-  }
-}
-
-
-/* Extended stuff */
-/* Output extended relocation information to a file in target byte order. */
-
-void
-swap_ext_reloc_out (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;		/* Generic relocation struct */
-     register struct reloc_ext_bytes *natptr;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_type;
-  unsigned int r_addend;
-
-  bfd_h_putlong (abfd, g->address, natptr->r_address);
-
-  /* Find a type in the output format which matches the input howto - 
-     at the moment we assume input format == output format FIXME!! */
-  r_type = (enum reloc_type) g->howto->type;
-
-  r_addend = g->addend;	/* Start here, see how it goes */
-
-  /* name was clobbered by sunos4_write_syms to be symbol index*/
-
-  if (g->sym_ptr_ptr != NULL) 
-    {
-      if ((*(g->sym_ptr_ptr))->section) {
-	/* put the section offset into the addend for output */
-	r_addend += (*(g->sym_ptr_ptr))->section->vma;
-      }
-
-      r_index = stoi((*(g->sym_ptr_ptr))->name);
-      r_extern = 1;
-    }
-  else {
-    r_extern = 0;
-    if (g->section == NULL) {
-      BFD_ASSERT(0);
-      r_index = N_ABS | N_EXT;
-    }
-    else  if(g->section->output_section == obj_textsec(abfd)) {
-      r_index = N_TEXT | N_EXT;
-      r_addend += g->section->output_section->vma;
-    }
-    else if (g->section->output_section == obj_datasec(abfd)) {
-      r_index = N_DATA | N_EXT;
-      r_addend += g->section->output_section->vma;
-    }
-    else if (g->section->output_section == obj_bsssec(abfd)) {
-      r_index = N_BSS | N_EXT ;
-      r_addend += g->section->output_section->vma;
-    }
-    else {
-      BFD_ASSERT(0);
-    }
-  }
-
-  /* now the fun stuff */
-  if (abfd->xvec->header_byteorder_big_p != false) {
-    natptr->r_index[0] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[2] = r_index;
-    natptr->r_bits[0] =
-      (r_extern? RELOC_EXT_BITS_EXTERN_BIG: 0)
-	|| (r_type << RELOC_EXT_BITS_TYPE_SH_BIG);
-  } else {
-    natptr->r_index[2] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[0] = r_index;
-    natptr->r_bits[0] =
-      (r_extern? RELOC_EXT_BITS_EXTERN_LITTLE: 0)
-	|| (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
-  }
-
-  bfd_h_putlong (abfd, r_addend, natptr->r_addend);
-}
-
-#define MOVE_ADDRESS(ad)       						\
-  if (r_extern) {							\
-    cache_ptr->sym_ptr_ptr = symbols + r_index;				\
-    cache_ptr->section = (asection *)NULL;				\
-      cache_ptr->addend = ad;						\
-  } else {								\
-    cache_ptr->sym_ptr_ptr = (asymbol **)NULL;				\
-    switch (r_index) {							\
-    case N_TEXT:							\
-    case N_TEXT | N_EXT:						\
-      cache_ptr->section = obj_textsec(abfd);				\
-      cache_ptr->addend = ad  - su->textsec->vma;			\
-      break;								\
-    case N_DATA:							\
-    case N_DATA | N_EXT:						\
-      cache_ptr->section = obj_datasec(abfd);				\
-      cache_ptr->addend = ad - su->datasec->vma;			\
-      break;								\
-    case N_BSS:								\
-    case N_BSS | N_EXT:							\
-      cache_ptr->section = obj_bsssec(abfd);				\
-      cache_ptr->addend = ad - su->bsssec->vma;				\
-      break;								\
-    case N_ABS:								\
-    case N_ABS | N_EXT:							\
-      cache_ptr->section = NULL;	/* No section */		\
-      cache_ptr->addend = ad;		/* FIXME, is this right? */	\
-      BFD_ASSERT(1);							\
-      break;								\
-    default:								\
-      cache_ptr->section = NULL;	/* No section */		\
-      cache_ptr->addend = ad;		/* FIXME, is this right? */	\
-      BFD_ASSERT(1);							\
-      break;								\
-    }									\
-  }     								\
-
-void
-swap_ext_reloc_in (abfd, bytes, cache_ptr, symbols)
-     bfd *abfd;
-     struct reloc_ext_bytes *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_type;
-  struct sunexdata *su = (struct sunexdata *)(abfd->tdata);
-
-  cache_ptr->address = bfd_h_getlong (abfd, bytes->r_address);
-
-  /* now the fun stuff */
-  if (abfd->xvec->header_byteorder_big_p != false) {
-    r_index =  (bytes->r_index[0] << 16)
-	     | (bytes->r_index[1] << 8)
-	     |  bytes->r_index[2];
-    r_extern = (0 != (bytes->r_bits[0] & RELOC_EXT_BITS_EXTERN_BIG));
-    r_type   =       (bytes->r_bits[0] & RELOC_EXT_BITS_TYPE_BIG)
-				      >> RELOC_EXT_BITS_TYPE_SH_BIG;
-  } else {
-    r_index =  (bytes->r_index[2] << 16)
-	     | (bytes->r_index[1] << 8)
-	     |  bytes->r_index[0];
-    r_extern = (0 != (bytes->r_bits[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
-    r_type   =       (bytes->r_bits[0] & RELOC_EXT_BITS_TYPE_LITTLE)
-				      >> RELOC_EXT_BITS_TYPE_SH_LITTLE;
-  }
-
-  cache_ptr->howto =  howto_table_ext + r_type;
-  MOVE_ADDRESS(bfd_h_getlong(abfd,bytes->r_addend));
-}
-
-void
-swap_std_reloc_in (abfd, bytes, cache_ptr, symbols)
-     bfd *abfd;
-     struct reloc_std_bytes *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  struct sunexdata *su = (struct sunexdata *)(abfd->tdata);
-
-  cache_ptr->address = bfd_h_getlong (abfd, bytes->r_address);
-
-  /* now the fun stuff */
-  if (abfd->xvec->header_byteorder_big_p != false) {
-    r_index =  (bytes->r_index[0] << 16)
-      | (bytes->r_index[1] << 8)
-	|  bytes->r_index[2];
-    r_extern  = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_EXTERN_BIG));
-    r_pcrel   = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_PCREL_BIG));
-    r_baserel = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_BASEREL_BIG));
-    r_jmptable= (0 != (bytes->r_bits[0] & RELOC_STD_BITS_JMPTABLE_BIG));
-    r_relative= (0 != (bytes->r_bits[0] & RELOC_STD_BITS_RELATIVE_BIG));
-    r_length  =       (bytes->r_bits[0] & RELOC_STD_BITS_LENGTH_BIG) 
-      			>> RELOC_STD_BITS_LENGTH_SH_BIG;
-  } else {
-    r_index =  (bytes->r_index[2] << 16)
-      | (bytes->r_index[1] << 8)
-	|  bytes->r_index[0];
-    r_extern  = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-    r_pcrel   = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_PCREL_LITTLE));
-    r_baserel = (0 != (bytes->r_bits[0] & RELOC_STD_BITS_BASEREL_LITTLE));
-    r_jmptable= (0 != (bytes->r_bits[0] & RELOC_STD_BITS_JMPTABLE_LITTLE));
-    r_relative= (0 != (bytes->r_bits[0] & RELOC_STD_BITS_RELATIVE_LITTLE));
-    r_length  =       (bytes->r_bits[0] & RELOC_STD_BITS_LENGTH_LITTLE) 
-      			>> RELOC_STD_BITS_LENGTH_SH_LITTLE;
-  }
-
-  cache_ptr->howto =  howto_table_std + r_length + 4 * r_pcrel;
-  /* FIXME-soon:  Roll baserel, jmptable, relative bits into howto setting */
-
-  MOVE_ADDRESS(0);
-}
-
-/* Reloc hackery */
-
-boolean
-sunos4_slurp_reloc_table (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
-{
-  unsigned int count;
-  size_t reloc_size;
-  PTR relocs;
-  arelent *reloc_cache;
-  size_t each_size;
-
-  if (asect->relocation) return true;
-
-  if (asect->flags & SEC_CONSTRUCTOR) return true;
-
-  if (asect == obj_datasec (abfd)) {
-    reloc_size = exec_hdr(abfd)->a_drsize;
-    goto doit;
-  }
-
-  if (asect == obj_textsec (abfd)) {
-    reloc_size = exec_hdr(abfd)->a_trsize;
-    goto doit;
-  }
-
-  bfd_error = invalid_operation;
-  return false;
-
- doit:
-  bfd_seek (abfd, asect->rel_filepos, SEEK_SET);
-  each_size = reloc_size_func(abfd);
-
-  count = reloc_size / each_size;
-
-
-  reloc_cache = (arelent *) bfd_zalloc (abfd, (size_t)(count * sizeof
-						       (arelent)));
-  if (!reloc_cache) {
-nomem:
-    bfd_error = no_memory;
-    return false;
-  }
-
-  relocs =  bfd_alloc (abfd, reloc_size);
-  if (!relocs) {
-    bfd_release (abfd, reloc_cache);
-    goto nomem;
-  }
-
-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size) {
-    bfd_release (abfd, relocs);
-    bfd_release (abfd, reloc_cache);
-    bfd_error = system_call_error;
-    return false;
-  }
-
-  if (each_size == RELOC_EXT_SIZE) {
-    register struct reloc_ext_bytes *rptr = (struct reloc_ext_bytes *) relocs;
-    unsigned int counter = 0;
-    arelent *cache_ptr = reloc_cache;
-
-    for (; counter < count; counter++, rptr++, cache_ptr++) {
-      swap_ext_reloc_in(abfd, rptr, cache_ptr, symbols);
-    }
-  } else {
-    register struct reloc_std_bytes *rptr = (struct reloc_std_bytes *) relocs;
-    unsigned int counter = 0;
-    arelent *cache_ptr = reloc_cache;
-
-    for (; counter < count; counter++, rptr++, cache_ptr++) {
-	swap_std_reloc_in(abfd, rptr, cache_ptr, symbols);
-    }
-
-  }
-
-  bfd_release (abfd,relocs);
-  asect->relocation = reloc_cache;
-  asect->reloc_count = count;
-  return true;
-}
-
-
-
-/* Write out a relocation section into an object file.  */
-
-static boolean
-sunos4_squirt_out_relocs (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  arelent **generic;
-  unsigned char *native, *natptr;
-  size_t each_size;
-
-  unsigned int count = section->reloc_count;
-  size_t natsize;
-
-  if (count == 0) return true;
-
-  each_size = reloc_size_func(abfd);
-  natsize = each_size * count;
-  native = (unsigned char *) bfd_zalloc (abfd, natsize);
-  if (!native) {
-    bfd_error = no_memory;
-    return false;
-  }
-
-  generic = section->orelocation;
-
-  if (each_size == RELOC_EXT_SIZE) 
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	swap_ext_reloc_out (abfd, *generic, (struct reloc_ext_bytes *)natptr);
-    }
-  else 
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	swap_std_reloc_out(abfd, *generic, (struct reloc_std_bytes *)natptr);
-    }
-
-  if ( bfd_write ((PTR) native, 1, natsize, abfd) != natsize) {
-    bfd_release(abfd, native);
-    return false;
-  }
-  bfd_release (abfd, native);
-
-  return true;
-}
-
-/* This is stupid.  This function should be a boolean predicate */
-unsigned int
-sunos4_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count;
-
-  if (!(tblptr || sunos4_slurp_reloc_table (abfd, section, symbols)))
-    return 0;
-
-  if (section->flags & SEC_CONSTRUCTOR) {
-    arelent_chain *chain = section->constructor_chain;
-    for (count = 0; count < section->reloc_count; count ++) {
-      *relptr ++ = &chain->relent;
-      chain = chain->next;
-    }
-  }
-  else {
-    tblptr = section->relocation;
-    if (!tblptr) return 0;
-
-    for (count = 0; count++ < section->reloc_count;) 
-      {
-	*relptr++ = tblptr++;
-      }
-  }
-  *relptr = 0;
-
-  return section->reloc_count;
-}
-
-unsigned int
-sunos4_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (bfd_get_format (abfd) != bfd_object) {
-    bfd_error = invalid_operation;
-    return 0;
-  }
-  if (asect->flags & SEC_CONSTRUCTOR) {
-    return (sizeof (arelent *) * (asect->reloc_count+1));
-  }
-
-
-  if (asect == obj_datasec (abfd))
-    return (sizeof (arelent *) *
-            ((exec_hdr(abfd)->a_drsize / reloc_size_func(abfd))
-             +1));
-
-  if (asect == obj_textsec (abfd))
-    return (sizeof (arelent *) *
-            ((exec_hdr(abfd)->a_trsize / reloc_size_func(abfd))
-             +1));
-
-  bfd_error = invalid_operation;
-  return 0;
-}
-
-void
-sunos4_reclaim_reloc (ignore_abfd, ignore)
-     bfd *ignore_abfd;
-     sec_ptr ignore;
-{
-
-}
-
-
-alent *
-sunos4_get_lineno(ignore_abfd, ignore_symbol)
-bfd *ignore_abfd;
-PTR ignore_symbol;
-{
-return (alent *)NULL;
-}
-
-void 
-sunos4_print_symbol(ignore_abfd, file,  symbol, how)
-bfd *ignore_abfd;
-FILE *file;
-asymbol *symbol;
-bfd_print_symbol_enum_type how;
-{
-  switch (how) {
-  case bfd_print_symbol_name_enum:
-    fprintf(file,"%s", symbol->name);
-    break;
-  case bfd_print_symbol_type_enum:
-    fprintf(file,"%4x %2x %2x",(unsigned)(aout_symbol(symbol)->desc & 0xffff),
-	    (unsigned)(aout_symbol(symbol)->other & 0xff),
-	    (unsigned)(aout_symbol(symbol)->type));
-    break;
-  case bfd_print_symbol_all_enum:
-    {
-   CONST char *section_name = symbol->section == (asection *)NULL ?
-	"*abs" : symbol->section->name;
-
-      bfd_print_symbol_vandf((PTR)file,symbol);
-
-      fprintf(file," %-5s %04x %02x %02x %s",
-	      section_name,
-	      (unsigned)(aout_symbol(symbol)->desc & 0xffff),
-	      (unsigned)(aout_symbol(symbol)->other & 0xff),
-	      (unsigned)(aout_symbol(symbol)->type  & 0xff),
-	      symbol->name);
-    }
-    break;
-  }
-}
-/* Once we know all the stuff that could be consed, we know how to clean
-   it up.  So why don't we? */
-
-boolean
-sunos4_close_and_cleanup (abfd)
-     bfd *abfd;
-{
-  if (!bfd_read_p (abfd))
-    switch (abfd->format) {
-    case bfd_archive:
-      if (!_bfd_write_archive_contents (abfd)) return false; break;
-    case bfd_object:
-      if (!sunos4_write_object_contents (abfd))  return false; break;
-    default: bfd_error = invalid_operation; return false;
-    }
-
-  return true;
-}
-
-/* 
- provided a bfd, a section and an offset into the section, calculate
- and return the name of the source file and the line nearest to the
- wanted location.
-*/
- 
-boolean
-DEFUN(sunos4_find_nearest_line,(abfd,
-				section,
-				symbols,
-				offset,
-				filename_ptr,
-				functionname_ptr,
-				line_ptr),
-      bfd *abfd AND
-      asection *section AND
-      asymbol **symbols AND
-      bfd_vma offset AND
-      CONST char **filename_ptr AND
-      CONST char **functionname_ptr AND
-      unsigned int *line_ptr)
-{
-  /* Run down the file looking for the filename, function and linenumber */
-  asymbol **p;
-  static  char buffer[100];
-  bfd_vma high_line_vma = ~0;
-  bfd_vma low_func_vma = 0;
-  asymbol *func = 0;
-  *filename_ptr = abfd->filename;
-  *functionname_ptr = 0;
-  *line_ptr = 0;
-  if (symbols != (asymbol **)NULL) {
-    for (p = symbols; *p; p++) {
-      aout_symbol_type  *q = (aout_symbol_type *)(*p);
-      switch (q->type){
-      case N_SO:
-	*filename_ptr = q->symbol.name;
-	if (obj_textsec(abfd) != section) {
-	  return true;
-	}
-	break;
-      case N_SLINE:
-
-      case N_DSLINE:
-      case N_BSLINE:
-	/* We'll keep this if it resolves nearer than the one we have already */
-	if (q->symbol.value >= offset &&
-	    q->symbol.value < high_line_vma) {
-	  *line_ptr = q->desc;
-	  high_line_vma = q->symbol.value;
-	}
-	break;
-      case N_FUN:
-	{
-	  /* We'll keep this if it is nearer than the one we have already */
-	  if (q->symbol.value >= low_func_vma &&
-	      q->symbol.value <= offset) {
-	    low_func_vma = q->symbol.value;
-	    func = (asymbol *)q;
-	  }
-	  if (*line_ptr && func) {
-	    CONST char *function = func->name;
-	    char *p;
-	    strncpy(buffer, function, sizeof(buffer)-1);
-	    buffer[sizeof(buffer)-1] = 0;
-	    /* Have to remove : stuff */
-	    p = strchr(buffer,':');
-	    if (p != NULL) {*p = NULL; }
-	    *functionname_ptr = buffer;
-	    return true;
-
-	  }
-	}
-	break;
-      }
-    }
-  }
-  
-  return true;
-
-}
-
-static int 
-DEFUN(sunos4_sizeof_headers,(ignore_abfd),
-      bfd *ignore_abfd)
-{
-  return 0;		/* FIXME, this is the wrong value! */
-}
-
-#define sunos4_openr_next_archived_file bfd_generic_openr_next_archived_file
-#define sunos4_generic_stat_arch_elt bfd_generic_stat_arch_elt
-#define sunos4_slurp_armap bfd_slurp_bsd_armap
-#define sunos4_slurp_extended_name_table bfd_true
-#define sunos4_write_armap bsd_write_armap
-#define sunos4_truncate_arname bfd_bsd_truncate_arname
-bfd_target aout_big_vec =
-{
-  "a.out-generic-big",		/* name */
+/* We use BFD generic archive files.  */
+#define	aout_openr_next_archived_file	bfd_generic_openr_next_archived_file
+#define	aout_generic_stat_arch_elt	bfd_generic_stat_arch_elt
+#define	aout_slurp_armap		bfd_slurp_bsd_armap
+#define	aout_slurp_extended_name_table	bfd_true
+#define	aout_write_armap		bsd_write_armap
+#define	aout_truncate_arname		bfd_bsd_truncate_arname
+
+/* We use our own core file format.  */
+#define	aout_core_file_failing_command	sunos4_core_file_failing_command
+#define	aout_core_file_failing_signal	sunos4_core_file_failing_signal
+#define	aout_core_file_matches_executable_p	\
+					sunos4_core_file_matches_executable_p
+
+/* We implement these routines ourselves, rather than using the generic
+   a.out versions.  */
+#define	aout_write_object_contents	sunos4_write_object_contents
+
+bfd_target sunos_big_vec =
+{
+  "a.out-sunos-big",		/* name */
   bfd_target_aout_flavour_enum,
   true,				/* target byte order */
   true,				/* target headers byte order */
@@ -1904,31 +600,8 @@ bfd_target aout_big_vec =
        bfd_generic_archive_p, sunos4_core_file_p},
     {bfd_false, sunos4_mkobject,
        _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, sunos4_write_object_contents,	/* bfd_write_contents */
+       _bfd_write_archive_contents, bfd_false},
 
-  JUMP_TABLE(sunos4)
-  };
-
-
-bfd_target aout_little_vec =
-{
-  "a.out-generic-little",		/* name */
-  bfd_target_aout_flavour_enum,
-  false,			/* target byte order */
-  false,			/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* data */
-  _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* hdrs */
-
-
-    {_bfd_dummy_target, sunos4_object_p,
-       bfd_generic_archive_p, sunos4_core_file_p},
-    {bfd_false, sunos4_mkobject,
-       _bfd_generic_mkarchive, bfd_false},
-
-  JUMP_TABLE(sunos4)
-  };
+  JUMP_TABLE(aout)
+};