* interp.c (sim_open): New arg `kind'.

[binutils.git] / bfd / bout.c

diff --git a/bfd/bout.c b/bfd/bout.c
index d560e8c8600ebf7eabd6aedac9aaba706d89703e..f850cc54d90fdab1abef3fc9f5dc7e271b96c7c2 100644 (file)
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel 960 b.out binaries.
 /* BFD back-end for Intel 960 b.out binaries.

-   Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 
 #include "bfd.h"
 
 
 #include "bfd.h"


@@ -35,21 +35,21 @@ static int aligncode PARAMS ((bfd *abfd, asection *input_section,
 static void perform_slip PARAMS ((bfd *abfd, unsigned int slip,
                                  asection *input_section, bfd_vma value));
 static boolean b_out_squirt_out_relocs PARAMS ((bfd *abfd, asection *section));
 static void perform_slip PARAMS ((bfd *abfd, unsigned int slip,
                                  asection *input_section, bfd_vma value));
 static boolean b_out_squirt_out_relocs PARAMS ((bfd *abfd, asection *section));

-static bfd_target *b_out_callback PARAMS ((bfd *));
+static const bfd_target *b_out_callback PARAMS ((bfd *));

 static bfd_reloc_status_type calljx_callback
   PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst,
           asection *));
 static bfd_reloc_status_type callj_callback
   PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data,
 static bfd_reloc_status_type calljx_callback
   PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst,
           asection *));
 static bfd_reloc_status_type callj_callback
   PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data,

-          unsigned int srcidx, unsigned int dstidx, asection *));
+          unsigned int srcidx, unsigned int dstidx, asection *, boolean));

 static bfd_vma get_value PARAMS ((arelent *, struct bfd_link_info *,
                                  asection *));
 static int abs32code PARAMS ((bfd *, asection *, arelent *,
                              unsigned int, struct bfd_link_info *));
 static bfd_vma get_value PARAMS ((arelent *, struct bfd_link_info *,
                                  asection *));
 static int abs32code PARAMS ((bfd *, asection *, arelent *,
                              unsigned int, struct bfd_link_info *));

-static boolean b_out_relax_section PARAMS ((bfd *, asection *,
-                                           struct bfd_link_info *,
-                                           boolean *));
-static bfd_byte *b_out_get_relocated_section_contents
+static boolean b_out_bfd_relax_section PARAMS ((bfd *, asection *,
+                                               struct bfd_link_info *,
+                                               boolean *));
+static bfd_byte *b_out_bfd_get_relocated_section_contents

   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
           bfd_byte *, boolean, asymbol **));
 
   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
           bfd_byte *, boolean, asymbol **));
 


@@ -114,7 +114,7 @@ bout_swap_exec_header_out (abfd, execp, raw_bytes)
 }
 
 
 }
 
 

-static bfd_target *
+static const bfd_target *

 b_out_object_p (abfd)
      bfd *abfd;
 {
 b_out_object_p (abfd)
      bfd *abfd;
 {


@@ -143,7 +143,7 @@ b_out_object_p (abfd)
 /* Finish up the opening of a b.out file for reading.  Fill in all the
    fields that are not handled by common code.  */
 
 /* Finish up the opening of a b.out file for reading.  Fill in all the
    fields that are not handled by common code.  */
 

-static bfd_target *
+static const bfd_target *

 b_out_callback (abfd)
      bfd *abfd;
 {
 b_out_callback (abfd)
      bfd *abfd;
 {


@@ -204,23 +204,16 @@ b_out_mkobject (abfd)
   struct bout_data_struct *rawptr;
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
   struct bout_data_struct *rawptr;
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));

-  if (rawptr == NULL) {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+  if (rawptr == NULL)
+    return false;

 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
 
 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
 

-  /* For simplicity's sake we just make all the sections right here. */

   obj_textsec (abfd) = (asection *)NULL;
   obj_datasec (abfd) = (asection *)NULL;
   obj_bsssec (abfd) = (asection *)NULL;
 
   obj_textsec (abfd) = (asection *)NULL;
   obj_datasec (abfd) = (asection *)NULL;
   obj_bsssec (abfd) = (asection *)NULL;
 

-  bfd_make_section (abfd, ".text");
-  bfd_make_section (abfd, ".data");
-  bfd_make_section (abfd, ".bss");
-

   return true;
 }
 
   return true;
 }
 


@@ -230,6 +223,9 @@ b_out_write_object_contents (abfd)
 {
   struct external_exec swapped_hdr;
 
 {
   struct external_exec swapped_hdr;
 

+  if (! aout_32_make_sections (abfd))
+    return false;
+

   exec_hdr (abfd)->a_info = BMAGIC;
 
   exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size;
   exec_hdr (abfd)->a_info = BMAGIC;
 
   exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size;


@@ -332,7 +328,7 @@ calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section)
 /* Magic to turn call into callj */
 static bfd_reloc_status_type
 callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
 /* Magic to turn call into callj */
 static bfd_reloc_status_type
 callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,

-               input_section)
+               input_section, shrinking)

      bfd *abfd;
      struct bfd_link_info *link_info;
      arelent *reloc_entry;
      bfd *abfd;
      struct bfd_link_info *link_info;
      arelent *reloc_entry;


@@ -340,6 +336,7 @@ callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
      unsigned int srcidx;
      unsigned int dstidx;
      asection *input_section;
      unsigned int srcidx;
      unsigned int dstidx;
      asection *input_section;

+     boolean shrinking;

 {
   int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx);
   asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
 {
   int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx);
   asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);


@@ -370,12 +367,21 @@ callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
                     - output_addr (input_section))
                    & BAL_MASK);
     }
                     - output_addr (input_section))
                    & BAL_MASK);
     }

+  else if ((symbol->symbol.flags & BSF_SECTION_SYM) != 0)
+    {
+      /* A callj against a symbol in the same section is a fully
+         resolved relative call.  We don't need to do anything here.
+         If the symbol is not in the same section, I'm not sure what
+         to do; fortunately, this case will probably never arise.  */
+      BFD_ASSERT (! shrinking);
+      BFD_ASSERT (symbol->symbol.section == input_section);
+    }

   else
     {
       word = CALL | (((word & BAL_MASK)
                      + value
                      + reloc_entry->addend
   else
     {
       word = CALL | (((word & BAL_MASK)
                      + value
                      + reloc_entry->addend

-                     - dstidx
+                     - (shrinking ? dstidx : 0)

                      - output_addr (input_section))
                     & BAL_MASK);
     }
                      - output_addr (input_section))
                     & BAL_MASK);
     }


@@ -427,8 +433,8 @@ static reloc_howto_type howto_done_align_table[] = {
   HOWTO (ALIGNDONE, 0xf, 0xf, 0, false, 0, complain_overflow_dont, 0, "donealign128", false, 0, 0, false),
 };
 
   HOWTO (ALIGNDONE, 0xf, 0xf, 0, false, 0, complain_overflow_dont, 0, "donealign128", false, 0, 0, false),
 };
 

-static const reloc_howto_type *
-b_out_reloc_type_lookup (abfd, code)
+static reloc_howto_type *
+b_out_bfd_reloc_type_lookup (abfd, code)

      bfd *abfd;
      bfd_reloc_code_real_type code;
 {
      bfd *abfd;
      bfd_reloc_code_real_type code;
 {


@@ -439,6 +445,7 @@ b_out_reloc_type_lookup (abfd, code)
     case BFD_RELOC_I960_CALLJ:
       return &howto_reloc_callj;
     case BFD_RELOC_32:
     case BFD_RELOC_I960_CALLJ:
       return &howto_reloc_callj;
     case BFD_RELOC_32:

+    case BFD_RELOC_CTOR:

       return &howto_reloc_abs32;
     case BFD_RELOC_24_PCREL:
       return &howto_reloc_pcrel24;
       return &howto_reloc_abs32;
     case BFD_RELOC_24_PCREL:
       return &howto_reloc_pcrel24;


@@ -480,6 +487,11 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     goto doit;
   }
 
     goto doit;
   }
 

+  if (asect == obj_bsssec (abfd)) {
+    reloc_size = 0;
+    goto doit;
+  }
+

   bfd_set_error (bfd_error_invalid_operation);
   return false;
 
   bfd_set_error (bfd_error_invalid_operation);
   return false;
 


@@ -488,27 +500,26 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     return false;
   count = reloc_size / sizeof (struct relocation_info);
 
     return false;
   count = reloc_size / sizeof (struct relocation_info);
 

-  relocs = (struct relocation_info *) malloc (reloc_size);
-  if (!relocs && reloc_size != 0) {
-    bfd_set_error (bfd_error_no_memory);
+  relocs = (struct relocation_info *) bfd_malloc (reloc_size);
+  if (!relocs && reloc_size != 0)

     return false;
     return false;

-  }
-  reloc_cache = (arelent *) malloc ((count+1) * sizeof (arelent));
+  reloc_cache = (arelent *) bfd_malloc ((count+1) * sizeof (arelent));

   if (!reloc_cache) {
   if (!reloc_cache) {

-    free ((char*)relocs);
-    bfd_set_error (bfd_error_no_memory);
+    if (relocs != NULL)
+      free ((char*)relocs);

     return false;
   }
 
   if (bfd_read ((PTR) relocs, 1, reloc_size, abfd) != reloc_size) {
     free (reloc_cache);
     return false;
   }
 
   if (bfd_read ((PTR) relocs, 1, reloc_size, abfd) != reloc_size) {
     free (reloc_cache);

-    free (relocs);
+    if (relocs != NULL)
+      free (relocs);

     return false;
   }
 
 
 
     return false;
   }
 
 
 

-  if (abfd->xvec->header_byteorder_big_p) {
+  if (bfd_header_big_endian (abfd)) {

     /* big-endian bit field allocation order */
     pcrel_mask  = 0x80;
     extern_mask = 0x10;
     /* big-endian bit field allocation order */
     pcrel_mask  = 0x80;
     extern_mask = 0x10;


@@ -534,7 +545,7 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     unsigned int symnum;
     cache_ptr->address = bfd_h_get_32 (abfd, raw + 0);
     cache_ptr->howto = 0;
     unsigned int symnum;
     cache_ptr->address = bfd_h_get_32 (abfd, raw + 0);
     cache_ptr->howto = 0;

-    if (abfd->xvec->header_byteorder_big_p)
+    if (bfd_header_big_endian (abfd))

     {
       symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6];
     }
     {
       symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6];
     }


@@ -594,7 +605,7 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
        if (raw[7] & pcrel_mask)
          {
            cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3];
        if (raw[7] & pcrel_mask)
          {
            cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3];

-           cache_ptr->sym_ptr_ptr = &bfd_abs_symbol;
+           cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;

          }
        else
          {
          }
        else
          {


@@ -658,7 +669,8 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
   }
 
 
   }
 
 

-  free (relocs);
+  if (relocs != NULL)
+    free (relocs);

   asect->relocation = reloc_cache;
   asect->reloc_count = count;
 
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
 


@@ -683,13 +695,11 @@ b_out_squirt_out_relocs (abfd, section)
   int extern_mask, pcrel_mask,  len_2, callj_mask;
   if (count == 0) return true;
   generic   = section->orelocation;
   int extern_mask, pcrel_mask,  len_2, callj_mask;
   if (count == 0) return true;
   generic   = section->orelocation;

-  native = ((struct relocation_info *) malloc (natsize));
-  if (!native && natsize != 0) {
-    bfd_set_error (bfd_error_no_memory);
+  native = ((struct relocation_info *) bfd_malloc (natsize));
+  if (!native && natsize != 0)

     return false;
     return false;

-  }

 
 

-  if (abfd->xvec->header_byteorder_big_p)
+  if (bfd_header_big_endian (abfd))

   {
     /* Big-endian bit field allocation order */
     pcrel_mask  = 0x80;
   {
     /* Big-endian bit field allocation order */
     pcrel_mask  = 0x80;


@@ -759,11 +769,11 @@ b_out_squirt_out_relocs (abfd, section)
     if (r_idx != 0)
       /* already mucked with r_extern, r_idx */;
     else if (bfd_is_com_section (output_section)
     if (r_idx != 0)
       /* already mucked with r_extern, r_idx */;
     else if (bfd_is_com_section (output_section)

-            || output_section == &bfd_abs_section
-            || output_section == &bfd_und_section)
+            || bfd_is_abs_section (output_section)
+            || bfd_is_und_section (output_section))

     {
 
     {
 

-      if (bfd_abs_section.symbol == sym)
+      if (bfd_abs_section_ptr->symbol == sym)

       {
        /* Whoops, looked like an abs symbol, but is really an offset
           from the abs section */
       {
        /* Whoops, looked like an abs symbol, but is really an offset
           from the abs section */


@@ -785,7 +795,7 @@ b_out_squirt_out_relocs (abfd, section)
       r_idx  = output_section->target_index;
     }
 
       r_idx  = output_section->target_index;
     }
 

-    if (abfd->xvec->header_byteorder_big_p) {
+    if (bfd_header_big_endian (abfd)) {

       raw[4] = (unsigned char) (r_idx >> 16);
       raw[5] = (unsigned char) (r_idx >>  8);
       raw[6] = (unsigned char) (r_idx     );
       raw[4] = (unsigned char) (r_idx >> 16);
       raw[5] = (unsigned char) (r_idx >>  8);
       raw[6] = (unsigned char) (r_idx     );


@@ -815,17 +825,30 @@ b_out_canonicalize_reloc (abfd, section, relptr, symbols)
      arelent **relptr;
      asymbol **symbols;
 {
      arelent **relptr;
      asymbol **symbols;
 {

-  arelent *tblptr = section->relocation;
-  unsigned int count = 0;
+  arelent *tblptr;
+  unsigned int count;

 
 

-  if (!(tblptr || b_out_slurp_reloc_table (abfd, section, symbols)))
-    return -1;
-  tblptr = section->relocation;
+  if ((section->flags & SEC_CONSTRUCTOR) != 0)
+    {
+      arelent_chain *chain = section->constructor_chain;
+      for (count = 0; count < section->reloc_count; count++)
+       {
+         *relptr++ = &chain->relent;
+         chain = chain->next;
+       }
+    }
+  else
+    {
+      if (section->relocation == NULL
+         && ! b_out_slurp_reloc_table (abfd, section, symbols))
+       return -1;

 
 

-  for (; count++ < section->reloc_count;)
-    *relptr++ = tblptr++;
+      tblptr = section->relocation;
+      for (count = 0; count++ < section->reloc_count;)
+       *relptr++ = tblptr++;
+    }

 
 

-  *relptr = 0;
+  *relptr = NULL;

 
   return section->reloc_count;
 }
 
   return section->reloc_count;
 }


@@ -840,6 +863,9 @@ b_out_get_reloc_upper_bound (abfd, asect)
     return -1;
   }
 
     return -1;
   }
 

+  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 / sizeof (struct relocation_info))
   if (asect == obj_datasec (abfd))
     return (sizeof (arelent *) *
            ((exec_hdr(abfd)->a_drsize / sizeof (struct relocation_info))


@@ -860,18 +886,15 @@ b_out_get_reloc_upper_bound (abfd, asect)
 static boolean
 b_out_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
 static boolean
 b_out_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;

-     sec_ptr section;
-     unsigned char *location;
+     asection *section;
+     PTR location;

      file_ptr offset;
      file_ptr offset;

-      int count;
+     bfd_size_type count;

 {
 
   if (abfd->output_has_begun == false) { /* set by bfd.c handler */
 {
 
   if (abfd->output_has_begun == false) { /* set by bfd.c handler */

-    if ((obj_textsec (abfd) == NULL) || (obj_datasec (abfd) == NULL) /*||
-        (obj_textsec (abfd)->_cooked_size == 0) || (obj_datasec (abfd)->_cooked_size == 0)*/) {
-      bfd_set_error (bfd_error_invalid_operation);
+    if (! aout_32_make_sections (abfd))

       return false;
       return false;

-    }

 
     obj_textsec (abfd)->filepos = sizeof(struct internal_exec);
     obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos
 
     obj_textsec (abfd)->filepos = sizeof(struct internal_exec);
     obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos


@@ -906,6 +929,8 @@ b_out_set_arch_mach (abfd, arch, machine)
     case bfd_mach_i960_xa:
     case bfd_mach_i960_ca:
     case bfd_mach_i960_ka_sa:
     case bfd_mach_i960_xa:
     case bfd_mach_i960_ca:
     case bfd_mach_i960_ka_sa:

+    case bfd_mach_i960_jx:
+    case bfd_mach_i960_hx:

     case 0:
       return true;
     default:
     case 0:
       return true;
     default:


@@ -939,7 +964,7 @@ get_value (reloc, link_info, input_section)
      base of the section.  To relocate, we find where the section will
      live in the output and add that in */
 
      base of the section.  To relocate, we find where the section will
      live in the output and add that in */
 

-  if (symbol->section == &bfd_und_section)
+  if (bfd_is_und_section (symbol->section))

     {
       struct bfd_link_hash_entry *h;
 
     {
       struct bfd_link_hash_entry *h;
 


@@ -951,7 +976,8 @@ get_value (reloc, link_info, input_section)
       h = bfd_link_hash_lookup (link_info->hash, bfd_asymbol_name (symbol),
                                false, false, true);
       if (h != (struct bfd_link_hash_entry *) NULL
       h = bfd_link_hash_lookup (link_info->hash, bfd_asymbol_name (symbol),
                                false, false, true);
       if (h != (struct bfd_link_hash_entry *) NULL

-         && h->type == bfd_link_hash_defined)
+         && (h->type == bfd_link_hash_defined
+             || h->type == bfd_link_hash_defweak))

        value = h->u.def.value + output_addr (h->u.def.section);
       else if (h != (struct bfd_link_hash_entry *) NULL
               && h->type == bfd_link_hash_common)
        value = h->u.def.value + output_addr (h->u.def.section);
       else if (h != (struct bfd_link_hash_entry *) NULL
               && h->type == bfd_link_hash_common)


@@ -999,11 +1025,11 @@ perform_slip (abfd, slip, input_section, value)
       if (p->value > value)
       {
        p->value -=slip;
       if (p->value > value)
       {
        p->value -=slip;

-       if (p->udata != NULL)
+       if (p->udata.p != NULL)

          {
            struct generic_link_hash_entry *h;
 
          {
            struct generic_link_hash_entry *h;
 

-           h = (struct generic_link_hash_entry *) p->udata;
+           h = (struct generic_link_hash_entry *) p->udata.p;

            BFD_ASSERT (h->root.type == bfd_link_hash_defined);
            h->root.u.def.value -= slip;
            BFD_ASSERT (h->root.u.def.value == p->value);
            BFD_ASSERT (h->root.type == bfd_link_hash_defined);
            h->root.u.def.value -= slip;
            BFD_ASSERT (h->root.u.def.value == p->value);


@@ -1100,7 +1126,7 @@ aligncode (abfd, input_section, r, shrink)
 }
 
 static boolean
 }
 
 static boolean

-b_out_relax_section (abfd, i, link_info, again)
+b_out_bfd_relax_section (abfd, i, link_info, again)

      bfd *abfd;
      asection *i;
      struct bfd_link_info *link_info;
      bfd *abfd;
      asection *i;
      struct bfd_link_info *link_info;


@@ -1125,12 +1151,9 @@ b_out_relax_section (abfd, i, link_info, again)
     {
       long reloc_count;
 
     {
       long reloc_count;
 

-      reloc_vector = (arelent **) malloc (reloc_size);
+      reloc_vector = (arelent **) bfd_malloc (reloc_size);

       if (reloc_vector == NULL && reloc_size != 0)
       if (reloc_vector == NULL && reloc_size != 0)

-       {
-         bfd_set_error (bfd_error_no_memory);
-         goto error_return;
-       }
+       goto error_return;

 
       /* Get the relocs and think about them */
       reloc_count =
 
       /* Get the relocs and think about them */
       reloc_count =


@@ -1174,8 +1197,8 @@ b_out_relax_section (abfd, i, link_info, again)
 }
 
 static bfd_byte *
 }
 
 static bfd_byte *

-b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data,
-                                     relocateable, symbols)
+b_out_bfd_get_relocated_section_contents (in_abfd, link_info, link_order,
+                                         data, relocateable, symbols)

      bfd *in_abfd;
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd *in_abfd;
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;


@@ -1201,12 +1224,9 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data,
                                                       data, relocateable,
                                                       symbols);
 
                                                       data, relocateable,
                                                       symbols);
 

-  reloc_vector = (arelent **) malloc (reloc_size);
+  reloc_vector = (arelent **) bfd_malloc (reloc_size);

   if (reloc_vector == NULL && reloc_size != 0)
   if (reloc_vector == NULL && reloc_size != 0)

-    {
-      bfd_set_error (bfd_error_no_memory);
-      goto error_return;
-    }
+    goto error_return;

 
   input_section->reloc_done = 1;
 
 
   input_section->reloc_done = 1;
 


@@ -1279,7 +1299,7 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data,
                  break;
                case CALLJ:
                  callj_callback (in_abfd, link_info, reloc, data, src_address,
                  break;
                case CALLJ:
                  callj_callback (in_abfd, link_info, reloc, data, src_address,

-                                 dst_address, input_section);
+                                 dst_address, input_section, false);

                  src_address+=4;
                  dst_address+=4;
                  break;
                  src_address+=4;
                  dst_address+=4;
                  break;


@@ -1294,7 +1314,8 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data,
                  /* This used to be a callx, but we've found out that a
                     callj will reach, so do the right thing.  */
                  callj_callback (in_abfd, link_info, reloc, data,
                  /* This used to be a callx, but we've found out that a
                     callj will reach, so do the right thing.  */
                  callj_callback (in_abfd, link_info, reloc, data,

-                                 src_address + 4, dst_address, input_section);
+                                 src_address + 4, dst_address, input_section,
+                                 true);

                  dst_address+=4;
                  src_address+=8;
                  break;
                  dst_address+=4;
                  src_address+=8;
                  break;


@@ -1356,47 +1377,23 @@ b_out_get_relocated_section_contents (in_abfd, link_info, link_order, data,
 
 /* Build the transfer vectors for Big and Little-Endian B.OUT files.  */
 
 
 /* Build the transfer vectors for Big and Little-Endian B.OUT files.  */
 

-/* We don't have core files.  */
-#define        aout_32_core_file_failing_command _bfd_dummy_core_file_failing_command
-#define        aout_32_core_file_failing_signal _bfd_dummy_core_file_failing_signal
-#define        aout_32_core_file_matches_executable_p  \
-                               _bfd_dummy_core_file_matches_executable_p
-
-/* We use BSD-Unix generic archive files.  */
-#define        aout_32_openr_next_archived_file        bfd_generic_openr_next_archived_file
-#define        aout_32_generic_stat_arch_elt   bfd_generic_stat_arch_elt
-#define        aout_32_slurp_armap             bfd_slurp_bsd_armap
-#define        aout_32_slurp_extended_name_table       _bfd_slurp_extended_name_table
-#define        aout_32_write_armap             bsd_write_armap
-#define        aout_32_truncate_arname         bfd_bsd_truncate_arname
-
-/* We override these routines from the usual a.out file routines.  */
-#define        aout_32_canonicalize_reloc      b_out_canonicalize_reloc
-#define        aout_32_get_reloc_upper_bound   b_out_get_reloc_upper_bound
-#define        aout_32_set_section_contents    b_out_set_section_contents
-#define        aout_32_set_arch_mach           b_out_set_arch_mach
-#define        aout_32_sizeof_headers          b_out_sizeof_headers
-
-#define aout_32_bfd_debug_info_start           bfd_void
-#define aout_32_bfd_debug_info_end             bfd_void
-#define aout_32_bfd_debug_info_accumulate      (PROTO(void,(*),(bfd*, struct sec *))) bfd_void
-
-#define aout_32_bfd_get_relocated_section_contents  b_out_get_relocated_section_contents
-#define aout_32_bfd_relax_section                   b_out_relax_section
-#define aout_32_bfd_reloc_type_lookup              b_out_reloc_type_lookup
-#define aout_32_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
-#define aout_32_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define aout_32_bfd_final_link _bfd_generic_final_link
+#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol

 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
 
 #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
 

-bfd_target b_out_vec_big_host =
+#define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define b_out_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define b_out_bfd_final_link _bfd_generic_final_link
+#define b_out_bfd_link_split_section  _bfd_generic_link_split_section
+
+#define aout_32_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+const bfd_target b_out_vec_big_host =

 {
   "b.out.big",                 /* name */
   bfd_target_aout_flavour,
 {
   "b.out.big",                 /* name */
   bfd_target_aout_flavour,

-  false,                       /* data byte order is little */
-  true,                                /* hdr byte order is big */
+  BFD_ENDIAN_LITTLE,           /* data byte order is little */
+  BFD_ENDIAN_BIG,              /* hdr byte order is big */

   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),


@@ -1404,7 +1401,6 @@ bfd_target b_out_vec_big_host =
   '_',                         /* symbol leading char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   '_',                         /* symbol leading char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

-  2,                           /* minumum alignment power */

 
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
      bfd_getl32, bfd_getl_signed_32, bfd_putl32,
 
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
      bfd_getl32, bfd_getl_signed_32, bfd_putl32,


@@ -1419,17 +1415,26 @@ bfd_target b_out_vec_big_host =
  {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
    _bfd_write_archive_contents, bfd_false},
 
  {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
    _bfd_write_archive_contents, bfd_false},
 

-  JUMP_TABLE(aout_32),
+     BFD_JUMP_TABLE_GENERIC (aout_32),
+     BFD_JUMP_TABLE_COPY (_bfd_generic),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+     BFD_JUMP_TABLE_SYMBOLS (aout_32),
+     BFD_JUMP_TABLE_RELOCS (b_out),
+     BFD_JUMP_TABLE_WRITE (b_out),
+     BFD_JUMP_TABLE_LINK (b_out),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+

   (PTR) 0,
 };
 
 
   (PTR) 0,
 };
 
 

-bfd_target b_out_vec_little_host =
+const bfd_target b_out_vec_little_host =

 {
   "b.out.little",              /* name */
   bfd_target_aout_flavour,
 {
   "b.out.little",              /* name */
   bfd_target_aout_flavour,

-  false,                       /* data byte order is little */
-  false,                       /* header byte order is little */
+  BFD_ENDIAN_LITTLE,           /* data byte order is little */
+  BFD_ENDIAN_LITTLE,           /* header byte order is little */

   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),


@@ -1437,7 +1442,6 @@ bfd_target b_out_vec_little_host =
   '_',                         /* symbol leading char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   '_',                         /* symbol leading char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

-  2,                           /* minum align */

   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
      bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
      bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */


@@ -1451,6 +1455,16 @@ bfd_target b_out_vec_little_host =
      _bfd_generic_mkarchive, bfd_false},
   {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
      _bfd_write_archive_contents, bfd_false},
      _bfd_generic_mkarchive, bfd_false},
   {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
      _bfd_write_archive_contents, bfd_false},

-  JUMP_TABLE(aout_32),
+
+     BFD_JUMP_TABLE_GENERIC (aout_32),
+     BFD_JUMP_TABLE_COPY (_bfd_generic),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+     BFD_JUMP_TABLE_SYMBOLS (aout_32),
+     BFD_JUMP_TABLE_RELOCS (b_out),
+     BFD_JUMP_TABLE_WRITE (b_out),
+     BFD_JUMP_TABLE_LINK (b_out),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+

   (PTR) 0
 };
   (PTR) 0
 };