* elf.c (map_sections_to_segments): When checking whether

[binutils.git] / bfd / bout.c

diff --git a/bfd/bout.c b/bfd/bout.c
index c730eb60b4b1964616f7603b8ad72b6619f9a985..f850cc54d90fdab1abef3fc9f5dc7e271b96c7c2 100644 (file)
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel 960 b.out binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995 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.
@@ -204,10 +204,8 @@ b_out_mkobject (abfd)
   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;
@@ -502,16 +500,13 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
     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;
-  }
-  reloc_cache = (arelent *) malloc ((count+1) * sizeof (arelent));
+  reloc_cache = (arelent *) bfd_malloc ((count+1) * sizeof (arelent));
   if (!reloc_cache) {
     if (relocs != NULL)
       free ((char*)relocs);
-    bfd_set_error (bfd_error_no_memory);
     return false;
   }
 
@@ -524,7 +519,7 @@ b_out_slurp_reloc_table (abfd, asect, symbols)
 
 
 
-  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;
@@ -550,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;
-    if (abfd->xvec->header_byteorder_big_p)
+    if (bfd_header_big_endian (abfd))
     {
       symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6];
     }
@@ -700,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;
-  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;
-  }
 
-  if (abfd->xvec->header_byteorder_big_p)
+  if (bfd_header_big_endian (abfd))
   {
     /* Big-endian bit field allocation order */
     pcrel_mask  = 0x80;
@@ -802,7 +795,7 @@ b_out_squirt_out_relocs (abfd, section)
       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     );
@@ -936,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_jx:
+    case bfd_mach_i960_hx:
     case 0:
       return true;
     default:
@@ -1156,12 +1151,9 @@ b_out_bfd_relax_section (abfd, i, link_info, again)
     {
       long reloc_count;
 
-      reloc_vector = (arelent **) malloc (reloc_size);
+      reloc_vector = (arelent **) bfd_malloc (reloc_size);
       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 =
@@ -1232,12 +1224,9 @@ b_out_bfd_get_relocated_section_contents (in_abfd, link_info, link_order,
                                                       data, relocateable,
                                                       symbols);
 
-  reloc_vector = (arelent **) malloc (reloc_size);
+  reloc_vector = (arelent **) bfd_malloc (reloc_size);
   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;
 
@@ -1396,13 +1385,15 @@ b_out_bfd_get_relocated_section_contents (in_abfd, link_info, link_order,
 #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,
-  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 ),
@@ -1410,7 +1401,6 @@ const bfd_target b_out_vec_big_host =
   '_',                         /* 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,
@@ -1443,8 +1433,8 @@ const bfd_target b_out_vec_little_host =
 {
   "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 ),
@@ -1452,7 +1442,6 @@ const bfd_target b_out_vec_little_host =
   '_',                         /* 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 */