* readelf.c (decode_location_expression): Loop through multiple

[deliverable/binutils-gdb.git] / bfd / ieee.c
diff --git a/bfd/ieee.c b/bfd/ieee.c

index 2d00507574aa0b11812e06067756d363252f4168..82b3bac8367f5251681be88ef0c4243742aebfb8 100644 (file)
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -1,5 +1,7 @@
  /* BFD back-end for ieee-695 objects.
  /* BFD back-end for ieee-695 objects.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   Free Software Foundation, Inc.
+
     Written by Steve Chamberlain of Cygnus Support.
  
  This file is part of BFD, the Binary File Descriptor library.
     Written by Steve Chamberlain of Cygnus Support.
  
  This file is part of BFD, the Binary File Descriptor library.
@@ -29,122 +31,150 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  #include "libbfd.h"
  #include "ieee.h"
  #include "libieee.h"
  #include "libbfd.h"
  #include "ieee.h"
  #include "libieee.h"
-#include "obstack.h"
-#define obstack_chunk_alloc malloc
-#define obstack_chunk_free free
+
+#include <ctype.h>
+
+static boolean ieee_write_byte PARAMS ((bfd *, int));
+static boolean ieee_write_2bytes PARAMS ((bfd *, int));
+static boolean ieee_write_int PARAMS ((bfd *, bfd_vma));
+static boolean ieee_write_id PARAMS ((bfd *, const char *));
+static boolean ieee_write_expression
+  PARAMS ((bfd *, bfd_vma, asymbol *, boolean, unsigned int));
+static void ieee_write_int5 PARAMS ((bfd_byte *, bfd_vma));
+static boolean ieee_write_int5_out PARAMS ((bfd *, bfd_vma));
+static boolean ieee_write_section_part PARAMS ((bfd *));
+static boolean do_with_relocs PARAMS ((bfd *, asection *));
+static boolean do_as_repeat PARAMS ((bfd *, asection *));
+static boolean do_without_relocs PARAMS ((bfd *, asection *));
+static boolean ieee_write_external_part PARAMS ((bfd *));
+static boolean ieee_write_data_part PARAMS ((bfd *));
+static boolean ieee_write_debug_part PARAMS ((bfd *));
+static boolean ieee_write_me_part PARAMS ((bfd *));
+static boolean ieee_write_processor PARAMS ((bfd *));
+
+static boolean ieee_slurp_debug PARAMS ((bfd *));
+static boolean ieee_slurp_section_data PARAMS ((bfd *));
  
  /* Functions for writing to ieee files in the strange way that the
     standard requires. */
  
  
  /* Functions for writing to ieee files in the strange way that the
     standard requires. */
  
-static void
-ieee_write_byte (abfd, byte)
+static boolean
+ieee_write_byte (abfd, barg)
       bfd *abfd;
       bfd *abfd;
-     bfd_byte byte;
+     int barg;
  {
  {
-  if (bfd_write ((PTR) & byte, 1, 1, abfd) != 1)
-    abort ();
-}
+  bfd_byte byte;
  
  
-static void
-ieee_write_twobyte (abfd, twobyte)
-     bfd *abfd;
-     int twobyte;
-{
-  bfd_byte b[2];
-  b[1] = twobyte & 0xff;
-  b[0] = twobyte >> 8;
-  if (bfd_write ((PTR) & b[0], 1, 2, abfd) != 2)
-    abort ();
+  byte = barg;
+  if (bfd_write ((PTR) &byte, 1, 1, abfd) != 1)
+    return false;
+  return true;
  }
  
  }
  
-static void
+static boolean
  ieee_write_2bytes (abfd, bytes)
       bfd *abfd;
       int bytes;
  {
    bfd_byte buffer[2];
  ieee_write_2bytes (abfd, bytes)
       bfd *abfd;
       int bytes;
  {
    bfd_byte buffer[2];
+
    buffer[0] = bytes >> 8;
    buffer[1] = bytes & 0xff;
    buffer[0] = bytes >> 8;
    buffer[1] = bytes & 0xff;
-
    if (bfd_write ((PTR) buffer, 1, 2, abfd) != 2)
    if (bfd_write ((PTR) buffer, 1, 2, abfd) != 2)
-    abort ();
+    return false;
+  return true;
  }
  
  }
  
-static void
+static boolean
  ieee_write_int (abfd, value)
       bfd *abfd;
       bfd_vma value;
  {
  ieee_write_int (abfd, value)
       bfd *abfd;
       bfd_vma value;
  {
-  if (((unsigned) value) <= 127)
+  if (value <= 127)
      {
      {
-      ieee_write_byte (abfd, (bfd_byte) value);
+      if (! ieee_write_byte (abfd, (bfd_byte) value))
+       return false;
      }
    else
      {
        unsigned int length;
      }
    else
      {
        unsigned int length;
+
        /* How many significant bytes ? */
        /* FIXME FOR LONGER INTS */
        if (value & 0xff000000)
        /* How many significant bytes ? */
        /* FIXME FOR LONGER INTS */
        if (value & 0xff000000)
-       {
-         length = 4;
-       }
+       length = 4;
        else if (value & 0x00ff0000)
        else if (value & 0x00ff0000)
-       {
-         length = 3;
-       }
+       length = 3;
        else if (value & 0x0000ff00)
        else if (value & 0x0000ff00)
-       {
-         length = 2;
-       }
+       length = 2;
        else
         length = 1;
  
        else
         length = 1;
  
-      ieee_write_byte (abfd,
-                (bfd_byte) ((int) ieee_number_repeat_start_enum + length));
+      if (! ieee_write_byte (abfd,
+                            (bfd_byte) ((int) ieee_number_repeat_start_enum
+                                        + length)))
+       return false;
        switch (length)
         {
         case 4:
        switch (length)
         {
         case 4:
-         ieee_write_byte (abfd, (bfd_byte) (value >> 24));
+         if (! ieee_write_byte (abfd, (bfd_byte) (value >> 24)))
+           return false;
+         /* Fall through.  */
         case 3:
         case 3:
-         ieee_write_byte (abfd, (bfd_byte) (value >> 16));
+         if (! ieee_write_byte (abfd, (bfd_byte) (value >> 16)))
+           return false;
+         /* Fall through.  */
         case 2:
         case 2:
-         ieee_write_byte (abfd, (bfd_byte) (value >> 8));
+         if (! ieee_write_byte (abfd, (bfd_byte) (value >> 8)))
+           return false;
+         /* Fall through.  */
         case 1:
         case 1:
-         ieee_write_byte (abfd, (bfd_byte) (value));
+         if (! ieee_write_byte (abfd, (bfd_byte) (value)))
+           return false;
         }
      }
         }
      }
+
+  return true;
  }
  
  }
  
-static void
+static boolean
  ieee_write_id (abfd, id)
       bfd *abfd;
  ieee_write_id (abfd, id)
       bfd *abfd;
-     CONST char *id;
+     const char *id;
  {
    size_t length = strlen (id);
  {
    size_t length = strlen (id);
+
    if (length <= 127)
      {
    if (length <= 127)
      {
-      ieee_write_byte (abfd, (bfd_byte) length);
+      if (! ieee_write_byte (abfd, (bfd_byte) length))
+       return false;
      }
    else if (length < 255)
      {
      }
    else if (length < 255)
      {
-      ieee_write_byte (abfd, ieee_extension_length_1_enum);
-      ieee_write_byte (abfd, (bfd_byte) length);
+      if (! ieee_write_byte (abfd, ieee_extension_length_1_enum)
+         || ! ieee_write_byte (abfd, (bfd_byte) length))
+       return false;
      }
    else if (length < 65535)
      {
      }
    else if (length < 65535)
      {
-      ieee_write_byte (abfd, ieee_extension_length_2_enum);
-      ieee_write_byte (abfd, (bfd_byte) (length >> 8));
-      ieee_write_byte (abfd, (bfd_byte) (length & 0xff));
+      if (! ieee_write_byte (abfd, ieee_extension_length_2_enum)
+         || ! ieee_write_2bytes (abfd, (int) length))
+       return false;
      }
    else
      {
      }
    else
      {
-      BFD_FAIL ();
+      (*_bfd_error_handler)
+       (_("%s: string too long (%d chars, max 65535)"),
+        bfd_get_filename (abfd), length);
+      bfd_set_error (bfd_error_invalid_operation);
+      return false;
      }
      }
+
    if (bfd_write ((PTR) id, 1, length, abfd) != length)
    if (bfd_write ((PTR) id, 1, length, abfd) != length)
-    abort ();
+    return false;
+  return true;
  }
  \f
  }
  \f
-
  /***************************************************************************
  Functions for reading from ieee files in the strange way that the
  standard requires:
  /***************************************************************************
  Functions for reading from ieee files in the strange way that the
  standard requires:
@@ -201,16 +231,13 @@ read_id (ieee)
    /* Buy memory and read string */
    string = bfd_alloc (ieee->abfd, length + 1);
    if (!string)
    /* Buy memory and read string */
    string = bfd_alloc (ieee->abfd, length + 1);
    if (!string)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
+    return NULL;
    bfd_get_string (ieee, string, length);
    string[length] = 0;
    return string;
  }
  
    bfd_get_string (ieee, string, length);
    string[length] = 0;
    return string;
  }
  
-static void
+static boolean
  ieee_write_expression (abfd, value, symbol, pcrel, index)
       bfd *abfd;
       bfd_vma value;
  ieee_write_expression (abfd, value, symbol, pcrel, index)
       bfd *abfd;
       bfd_vma value;
@@ -222,7 +249,8 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
  
    if (value != 0)
      {
  
    if (value != 0)
      {
-      ieee_write_int (abfd, value);
+      if (! ieee_write_int (abfd, value))
+       return false;
        term_count++;
      }
  
        term_count++;
      }
  
@@ -230,63 +258,77 @@ ieee_write_expression (abfd, value, symbol, pcrel, index)
        || bfd_is_und_section (symbol->section))
      {
        /* Def of a common symbol */
        || bfd_is_und_section (symbol->section))
      {
        /* Def of a common symbol */
-      ieee_write_byte (abfd, ieee_variable_X_enum);
-      ieee_write_int (abfd, symbol->value);
+      if (! ieee_write_byte (abfd, ieee_variable_X_enum)
+         || ! ieee_write_int (abfd, symbol->value))
+       return false;
        term_count++;
      }
    else if (! bfd_is_abs_section (symbol->section))
      {
        /* Ref to defined symbol - */
  
        term_count++;
      }
    else if (! bfd_is_abs_section (symbol->section))
      {
        /* Ref to defined symbol - */
  
-      ieee_write_byte (abfd, ieee_variable_R_enum);
-      ieee_write_byte (abfd,
-           (bfd_byte) (symbol->section->index + IEEE_SECTION_NUMBER_BASE));
-      term_count++;
        if (symbol->flags & BSF_GLOBAL)
         {
        if (symbol->flags & BSF_GLOBAL)
         {
-         ieee_write_byte (abfd, ieee_variable_I_enum);
-         ieee_write_int (abfd, symbol->value);
+         if (! ieee_write_byte (abfd, ieee_variable_I_enum)
+             || ! ieee_write_int (abfd, symbol->value))
+           return false;
           term_count++;
         }
        else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
         {
           term_count++;
         }
        else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
         {
-         /* This is a reference to a defined local symbol,
-        We can easily do a local as a section+offset */
-         ieee_write_byte (abfd, ieee_variable_R_enum); /* or L */
-         ieee_write_byte (abfd,
-           (bfd_byte) (symbol->section->index + IEEE_SECTION_NUMBER_BASE));
-         ieee_write_int (abfd, symbol->value);
+         /* This is a reference to a defined local symbol.  We can
+            easily do a local as a section+offset.  */
+         if (! ieee_write_byte (abfd, ieee_variable_R_enum)
+             || ! ieee_write_byte (abfd,
+                                   (bfd_byte) (symbol->section->index
+                                               + IEEE_SECTION_NUMBER_BASE)))
+           return false;
           term_count++;
           term_count++;
+         if (symbol->value != 0)
+           {
+             if (! ieee_write_int (abfd, symbol->value))
+               return false;
+             term_count++;
+           }
         }
        else
         {
         }
        else
         {
-         BFD_FAIL ();
+         (*_bfd_error_handler)
+           (_("%s: unrecognized symbol `%s' flags 0x%x"),
+            bfd_get_filename (abfd), bfd_asymbol_name (symbol),
+            symbol->flags);
+         bfd_set_error (bfd_error_invalid_operation);
+         return false;
         }
      }
  
    if (pcrel)
      {
        /* subtract the pc from here by asking for PC of this section*/
         }
      }
  
    if (pcrel)
      {
        /* subtract the pc from here by asking for PC of this section*/
-      ieee_write_byte (abfd, ieee_variable_P_enum);
-      ieee_write_byte (abfd, (bfd_byte) (index + IEEE_SECTION_NUMBER_BASE));
-      ieee_write_byte (abfd, ieee_function_minus_enum);
+      if (! ieee_write_byte (abfd, ieee_variable_P_enum)
+         || ! ieee_write_byte (abfd,
+                               (bfd_byte) (index + IEEE_SECTION_NUMBER_BASE))
+         || ! ieee_write_byte (abfd, ieee_function_minus_enum))
+       return false;
      }
  
      }
  
-  if (term_count == 1)
+  /* Handle the degenerate case of a 0 address.  */
+  if (term_count == 0)
      {
      {
-      ieee_write_byte (abfd, 0);
+      if (! ieee_write_int (abfd, 0))
+       return false;
      }
      }
-  else
+
+  while (term_count > 1)
      {
      {
-      while (term_count > 1)
-       {
-         ieee_write_byte (abfd, ieee_function_plus_enum);
-         term_count--;
-       }
+      if (! ieee_write_byte (abfd, ieee_function_plus_enum))
+       return false;
+      term_count--;
      }
      }
+
+  return true;
  }
  \f
  }
  \f
-
  /*****************************************************************************/
  
  /*
  /*****************************************************************************/
  
  /*
@@ -304,15 +346,17 @@ ieee_write_int5 (buffer, value)
    buffer[4] = (value >> 0) & 0xff;
  }
  
    buffer[4] = (value >> 0) & 0xff;
  }
  
-static void
+static boolean
  ieee_write_int5_out (abfd, value)
       bfd *abfd;
       bfd_vma value;
  {
    bfd_byte b[5];
  ieee_write_int5_out (abfd, value)
       bfd *abfd;
       bfd_vma value;
  {
    bfd_byte b[5];
+
    ieee_write_int5 (b, value);
    if (bfd_write ((PTR) b, 1, 5, abfd) != 5)
    ieee_write_int5 (b, value);
    if (bfd_write ((PTR) b, 1, 5, abfd) != 5)
-    abort ();
+    return false;
+  return true;
  }
  
  static boolean
  }
  
  static boolean
@@ -371,34 +415,109 @@ typedef struct
  } ieee_value_type;
  
  
  } ieee_value_type;
  
  
-static
-reloc_howto_type abs32_howto
-= HOWTO (1, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "abs32", true, 0xffffffff, 0xffffffff, false);
-static
-reloc_howto_type abs16_howto
-= HOWTO (1, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false);
-
-static
-reloc_howto_type abs8_howto
-= HOWTO (1, 0, 0, 8, false, 0, complain_overflow_bitfield, 0, "abs8", true, 0x000000ff, 0x000000ff, false);
-
-static
-reloc_howto_type rel32_howto
-= HOWTO (1, 0, 2, 32, true, 0, complain_overflow_signed, 0, "rel32", true, 0xffffffff,
-        0xffffffff, false);
+#if KEEPMINUSPCININST
  
  
-static
-reloc_howto_type rel16_howto
-= HOWTO (1, 0, 1, 16, true, 0, complain_overflow_signed, 0, "rel16", true, 0x0000ffff, 0x0000ffff, false);
+#define SRC_MASK(arg) arg
+#define PCREL_OFFSET false
  
  
-static
-reloc_howto_type rel8_howto
-= HOWTO (1, 0, 0, 8, true, 0, complain_overflow_signed, 0, "rel8", true, 0x000000ff, 0x000000ff, false);
+#else
  
  
+#define SRC_MASK(arg) 0
+#define PCREL_OFFSET true
  
  
-static ieee_symbol_index_type NOSYMBOL =
-{0, 0};
+#endif
  
  
+static reloc_howto_type abs32_howto =
+  HOWTO (1,
+        0,
+        2,
+        32,
+        false,
+        0,
+        complain_overflow_bitfield,
+        0,
+        "abs32",
+        true,
+        0xffffffff,
+        0xffffffff,
+        false);
+
+static reloc_howto_type abs16_howto =
+  HOWTO (1,
+        0,
+        1,
+        16,
+        false,
+        0,
+        complain_overflow_bitfield,
+        0,
+        "abs16",
+        true,
+        0x0000ffff,
+        0x0000ffff,
+        false);
+
+static reloc_howto_type abs8_howto =
+  HOWTO (1,
+        0,
+        0,
+        8,
+        false,
+        0,
+        complain_overflow_bitfield,
+        0,
+        "abs8",
+        true,
+        0x000000ff,
+        0x000000ff,
+        false);
+
+static reloc_howto_type rel32_howto =
+  HOWTO (1,
+        0,
+        2,
+        32,
+        true,
+        0,
+        complain_overflow_signed,
+        0,
+        "rel32",
+        true,
+        SRC_MASK (0xffffffff),
+        0xffffffff,
+        PCREL_OFFSET);
+
+static reloc_howto_type rel16_howto =
+  HOWTO (1,
+        0,
+        1,
+        16,
+        true,
+        0,
+        complain_overflow_signed,
+        0,
+        "rel16",
+        true,
+        SRC_MASK (0x0000ffff),
+        0x0000ffff,
+        PCREL_OFFSET);
+
+static reloc_howto_type rel8_howto =
+  HOWTO (1,
+        0,
+        0,
+        8,
+        true,
+        0,
+        complain_overflow_signed,
+        0,
+        "rel8",
+        true,
+        SRC_MASK (0x000000ff),
+        0x000000ff,
+        PCREL_OFFSET);
+
+static ieee_symbol_index_type NOSYMBOL = {0, 0};
  
  static void
  parse_expression (ieee, value, symbol, pcrel, extra, section)
  
  static void
  parse_expression (ieee, value, symbol, pcrel, extra, section)
@@ -435,9 +554,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
             next_byte (&(ieee->h));
             *pcrel = true;
             section_n = must_parse_int (&(ieee->h));
             next_byte (&(ieee->h));
             *pcrel = true;
             section_n = must_parse_int (&(ieee->h));
-           PUSH (NOSYMBOL, bfd_abs_section_ptr,
-                 TOS.value = ieee->section_table[section_n]->vma +
-                 ieee_per_section (ieee->section_table[section_n])->pc);
+           PUSH (NOSYMBOL, bfd_abs_section_ptr, 0);
             break;
           }
         case ieee_variable_L_enum:
             break;
           }
         case ieee_variable_L_enum:
@@ -459,6 +576,16 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
                 ieee->section_table[must_parse_int (&(ieee->h))]->_raw_size);
           break;
         case ieee_variable_I_enum:
                 ieee->section_table[must_parse_int (&(ieee->h))]->_raw_size);
           break;
         case ieee_variable_I_enum:
+         /* Push the address of variable n */
+         {
+           ieee_symbol_index_type sy;
+           next_byte (&(ieee->h));
+           sy.index = (int) must_parse_int (&(ieee->h));
+           sy.letter = 'I';
+
+           PUSH (sy, bfd_abs_section_ptr, 0);
+         }
+         break;
         case ieee_variable_X_enum:
           /* Push the address of external variable n */
           {
         case ieee_variable_X_enum:
           /* Push the address of external variable n */
           {
@@ -479,7 +606,7 @@ parse_expression (ieee, value, symbol, pcrel, extra, section)
  
             POP (sy, section1, value1);
             POP (sy, section_dummy, value2);
  
             POP (sy, section1, value1);
             POP (sy, section_dummy, value2);
-           PUSH (sy, section1 ? section1 : section_dummy, value1 - value2);
+           PUSH (sy, section1 ? section1 : section_dummy, value2 - value1);
           }
           break;
         case ieee_function_plus_enum:
           }
           break;
         case ieee_function_plus_enum:
@@ -558,7 +685,7 @@ get_symbol (abfd,
             max_index,
             this_type
  )
             max_index,
             this_type
  )
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
       ieee_data_type *ieee;
       ieee_symbol_type *last_symbol;
       unsigned int *symbol_count;
       ieee_data_type *ieee;
       ieee_symbol_type *last_symbol;
       unsigned int *symbol_count;
@@ -574,10 +701,7 @@ get_symbol (abfd,
        ieee_symbol_type *new_symbol = (ieee_symbol_type *) bfd_alloc (ieee->h.abfd,
                                                  sizeof (ieee_symbol_type));
        if (!new_symbol)
        ieee_symbol_type *new_symbol = (ieee_symbol_type *) bfd_alloc (ieee->h.abfd,
                                                  sizeof (ieee_symbol_type));
        if (!new_symbol)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         return NULL;
-       }
+       return NULL;
  
        new_symbol->index = new_index;
        last_index = new_index;
  
        new_symbol->index = new_index;
        last_index = new_index;
@@ -589,6 +713,7 @@ get_symbol (abfd,
           *max_index = new_index;
         }
        last_type = this_type;
           *max_index = new_index;
         }
        last_type = this_type;
+      new_symbol->symbol.section = bfd_abs_section_ptr;
        return new_symbol;
      }
    return last_symbol;
        return new_symbol;
      }
    return last_symbol;
@@ -620,7 +745,7 @@ ieee_slurp_external_symbols (abfd)
  
           symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
                                &prev_symbols_ptr,
  
           symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
                                &prev_symbols_ptr,
-                              &ieee->external_symbol_max_index, 'D');
+                              &ieee->external_symbol_max_index, 'I');
           if (symbol == NULL)
             return false;
  
           if (symbol == NULL)
             return false;
  
@@ -651,25 +776,73 @@ ieee_slurp_external_symbols (abfd)
             unsigned int symbol_type_index;
             unsigned int symbol_attribute_def;
             bfd_vma value;
             unsigned int symbol_type_index;
             unsigned int symbol_attribute_def;
             bfd_vma value;
-           next_byte (&(ieee->h));     /* Skip prefix */
-           next_byte (&(ieee->h));
-           symbol_name_index = must_parse_int (&(ieee->h));
-           symbol_type_index = must_parse_int (&(ieee->h));
-           symbol_attribute_def = must_parse_int (&(ieee->h));
-           switch (symbol_attribute_def)
+           switch (read_2bytes (ieee))
               {
               {
-             case 63:
-               /* Module misc; followed by two fields which describe the
-              current module block. The first fired is the type id
-              number, the second is the number of asn records
-              associated with the directive */
+             case ieee_attribute_record_enum:
+               symbol_name_index = must_parse_int (&(ieee->h));
+               symbol_type_index = must_parse_int (&(ieee->h));
+               symbol_attribute_def = must_parse_int (&(ieee->h));
+               switch (symbol_attribute_def)
+                 {
+                 case 8:
+                 case 19:
+                   parse_int (&ieee->h, &value);
+                   break;
+                 default:
+                   (*_bfd_error_handler)
+                     (_("%s: unimplemented ATI record  %u for symbol %u"),
+                      bfd_get_filename (abfd), symbol_attribute_def,
+                      symbol_name_index);
+                   bfd_set_error (bfd_error_bad_value);
+                   return false;
+                   break;
+                 }
+               break;
+             case ieee_external_reference_info_record_enum:
+               /* Skip over ATX record. */
+               parse_int (&(ieee->h), &value);
                 parse_int (&(ieee->h), &value);
                 parse_int (&(ieee->h), &value);
                 parse_int (&(ieee->h), &value);
                 parse_int (&(ieee->h), &value);
-               break;
-
-             default:
                 parse_int (&(ieee->h), &value);
                 break;
                 parse_int (&(ieee->h), &value);
                 break;
+             case ieee_atn_record_enum:
+               /* We may get call optimization information here,
+                  which we just ignore.  The format is
+                  {$F1}${CE}{index}{$00}{$3F}{$3F}{#_of_ASNs} */
+               parse_int (&ieee->h, &value);
+               parse_int (&ieee->h, &value);
+               parse_int (&ieee->h, &value);
+               if (value != 0x3f)
+                 {
+                   (*_bfd_error_handler)
+                     (_("%s: unexpected ATN type %d in external part"),
+                        bfd_get_filename (abfd), (int) value);
+                   bfd_set_error (bfd_error_bad_value);
+                   return false;
+                 }
+               parse_int (&ieee->h, &value);
+               parse_int (&ieee->h, &value);
+               while (value > 0)
+                 {
+                   bfd_vma val1;
+
+                   --value;
+
+                   switch (read_2bytes (ieee))
+                     {
+                     case ieee_asn_record_enum:
+                       parse_int (&ieee->h, &val1);
+                       parse_int (&ieee->h, &val1);
+                       break;
+
+                     default:
+                       (*_bfd_error_handler)
+                         (_("%s: unexpected type after ATN"),
+                            bfd_get_filename (abfd));
+                       bfd_set_error (bfd_error_bad_value);
+                       return false;
+                     }
+                 }
               }
           }
           break;
               }
           }
           break;
@@ -690,6 +863,28 @@ ieee_slurp_external_symbols (abfd)
                               &extra,
                               &symbol->symbol.section);
  
                               &extra,
                               &symbol->symbol.section);
  
+           /* Fully linked IEEE-695 files tend to give every symbol
+               an absolute value.  Try to convert that back into a
+               section relative value.  FIXME: This won't always to
+               the right thing.  */
+           if (bfd_is_abs_section (symbol->symbol.section)
+               && (abfd->flags & HAS_RELOC) == 0)
+             {
+               bfd_vma val;
+               asection *s;
+
+               val = symbol->symbol.value;
+               for (s = abfd->sections; s != NULL; s = s->next)
+                 {
+                   if (val >= s->vma && val < s->vma + s->_raw_size)
+                     {
+                       symbol->symbol.section = s;
+                       symbol->symbol.value -= s->vma;
+                       break;
+                     }
+                 }
+             }
+
             symbol->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
  
           }
             symbol->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
  
           }
@@ -815,7 +1010,7 @@ ieee_get_symtab (abfd, location)
    static bfd dummy_bfd;
    static asymbol empty_symbol =
    /* the_bfd, name, value, attr, section */
    static bfd dummy_bfd;
    static asymbol empty_symbol =
    /* the_bfd, name, value, attr, section */
-  {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, bfd_abs_section_ptr};
+  {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, bfd_abs_section_ptr, { 0 }};
  
    if (abfd->symcount)
      {
  
    if (abfd->symcount)
      {
@@ -870,16 +1065,36 @@ get_section_entry (abfd, ieee, index)
       ieee_data_type *ieee;
       unsigned int index;
  {
       ieee_data_type *ieee;
       unsigned int index;
  {
+  if (index >= ieee->section_table_size)
+    {
+      unsigned int c, i;
+      asection **n;
+
+      c = ieee->section_table_size;
+      if (c == 0)
+       c = 20;
+      while (c <= index)
+       c *= 2;
+
+      n = ((asection **)
+          bfd_realloc (ieee->section_table, c * sizeof (asection *)));
+      if (n == NULL)
+       return NULL;
+
+      for (i = ieee->section_table_size; i < c; i++)
+       n[i] = NULL;
+
+      ieee->section_table = n;
+      ieee->section_table_size = c;
+    }
+
    if (ieee->section_table[index] == (asection *) NULL)
      {
        char *tmp = bfd_alloc (abfd, 11);
        asection *section;
  
        if (!tmp)
    if (ieee->section_table[index] == (asection *) NULL)
      {
        char *tmp = bfd_alloc (abfd, 11);
        asection *section;
  
        if (!tmp)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         return NULL;
-       }
+       return NULL;
        sprintf (tmp, " fsec%4d", index);
        section = bfd_make_section (abfd, tmp);
        ieee->section_table[index] = section;
        sprintf (tmp, " fsec%4d", index);
        section = bfd_make_section (abfd, tmp);
        ieee->section_table[index] = section;
@@ -912,18 +1127,20 @@ ieee_slurp_sections (abfd)
                 unsigned int section_index;
                 next_byte (&(ieee->h));
                 section_index = must_parse_int (&(ieee->h));
                 unsigned int section_index;
                 next_byte (&(ieee->h));
                 section_index = must_parse_int (&(ieee->h));
-               /* Fixme to be nice about a silly number of sections */
-               BFD_ASSERT (section_index < NSECTIONS);
  
                 section = get_section_entry (abfd, ieee, section_index);
  
                 section_type[0] = this_byte_and_next (&(ieee->h));
  
                 section = get_section_entry (abfd, ieee, section_index);
  
                 section_type[0] = this_byte_and_next (&(ieee->h));
+
+               /* Set minimal section attributes. Attributes are
+                  extended later, based on section contents. */
+
                 switch (section_type[0])
                   {
                   case 0xC1:
                     /* Normal attributes for absolute sections  */
                     section_type[1] = this_byte (&(ieee->h));
                 switch (section_type[0])
                   {
                   case 0xC1:
                     /* Normal attributes for absolute sections  */
                     section_type[1] = this_byte (&(ieee->h));
-                   section->flags = SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+                   section->flags = SEC_ALLOC;
                     switch (section_type[1])
                       {
                       case 0xD3:        /* AS Absolute section attributes */
                     switch (section_type[1])
                       {
                       case 0xD3:        /* AS Absolute section attributes */
@@ -934,17 +1151,17 @@ ieee_slurp_sections (abfd)
                           case 0xD0:
                             /* Normal code */
                             next_byte (&(ieee->h));
                           case 0xD0:
                             /* Normal code */
                             next_byte (&(ieee->h));
-                           section->flags |= SEC_LOAD | SEC_CODE;
+                           section->flags |= SEC_CODE;
                             break;
                           case 0xC4:
                             break;
                           case 0xC4:
-                           next_byte (&(ieee->h));
-                           section->flags |= SEC_LOAD | SEC_DATA;
                             /* Normal data */
                             /* Normal data */
+                           next_byte (&(ieee->h));
+                           section->flags |= SEC_DATA;
                             break;
                           case 0xD2:
                             next_byte (&(ieee->h));
                             /* Normal rom data */
                             break;
                           case 0xD2:
                             next_byte (&(ieee->h));
                             /* Normal rom data */
-                           section->flags |= SEC_LOAD | SEC_ROM | SEC_DATA;
+                           section->flags |= SEC_ROM | SEC_DATA;
                             break;
                           default:
                             break;
                             break;
                           default:
                             break;
@@ -953,20 +1170,20 @@ ieee_slurp_sections (abfd)
                     break;
                   case 0xC3:    /* Named relocatable sections (type C) */
                     section_type[1] = this_byte (&(ieee->h));
                     break;
                   case 0xC3:    /* Named relocatable sections (type C) */
                     section_type[1] = this_byte (&(ieee->h));
-                   section->flags = SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+                   section->flags = SEC_ALLOC;
                     switch (section_type[1])
                       {
                       case 0xD0:        /* Normal code (CP) */
                         next_byte (&(ieee->h));
                     switch (section_type[1])
                       {
                       case 0xD0:        /* Normal code (CP) */
                         next_byte (&(ieee->h));
-                       section->flags |= SEC_LOAD | SEC_CODE;
+                       section->flags |= SEC_CODE;
                         break;
                       case 0xC4:        /* Normal data (CD) */
                         next_byte (&(ieee->h));
                         break;
                       case 0xC4:        /* Normal data (CD) */
                         next_byte (&(ieee->h));
-                       section->flags |= SEC_LOAD | SEC_DATA;
+                       section->flags |= SEC_DATA;
                         break;
                       case 0xD2:        /* Normal rom data (CR) */
                         next_byte (&(ieee->h));
                         break;
                       case 0xD2:        /* Normal rom data (CR) */
                         next_byte (&(ieee->h));
-                       section->flags |= SEC_LOAD | SEC_ROM | SEC_DATA;
+                       section->flags |= SEC_ROM | SEC_DATA;
                         break;
                       default:
                         break;
                         break;
                       default:
                         break;
@@ -1021,6 +1238,7 @@ ieee_slurp_sections (abfd)
                   case ieee_region_base_address_enum:
                     section = ieee->section_table[must_parse_int (&(ieee->h))];
                     section->vma = must_parse_int (&(ieee->h));
                   case ieee_region_base_address_enum:
                     section = ieee->section_table[must_parse_int (&(ieee->h))];
                     section->vma = must_parse_int (&(ieee->h));
+                   section->lma = section->vma;
                     break;
                   case ieee_mau_size_enum:
                     must_parse_int (&(ieee->h));
                     break;
                   case ieee_mau_size_enum:
                     must_parse_int (&(ieee->h));
@@ -1033,6 +1251,7 @@ ieee_slurp_sections (abfd)
                   case ieee_section_base_address_enum:
                     section = ieee->section_table[must_parse_int (&(ieee->h))];
                     section->vma = must_parse_int (&(ieee->h));
                   case ieee_section_base_address_enum:
                     section = ieee->section_table[must_parse_int (&(ieee->h))];
                     section->vma = must_parse_int (&(ieee->h));
+                   section->lma = section->vma;
                     break;
                   case ieee_section_offset_enum:
                     (void) must_parse_int (&(ieee->h));
                     break;
                   case ieee_section_offset_enum:
                     (void) must_parse_int (&(ieee->h));
@@ -1049,8 +1268,39 @@ ieee_slurp_sections (abfd)
         }
      }
  }
         }
      }
  }
-\f
  
  
+/* Make a section for the debugging information, if any.  We don't try
+   to interpret the debugging information; we just point the section
+   at the area in the file so that program which understand can dig it
+   out.  */
+
+static boolean
+ieee_slurp_debug (abfd)
+     bfd *abfd;
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  asection *sec;
+  file_ptr debug_end;
+
+  if (ieee->w.r.debug_information_part == 0)
+    return true;
+
+  sec = bfd_make_section (abfd, ".debug");
+  if (sec == NULL)
+    return false;
+  sec->flags |= SEC_DEBUGGING | SEC_HAS_CONTENTS;
+  sec->filepos = ieee->w.r.debug_information_part;
+
+  debug_end = ieee->w.r.data_part;
+  if (debug_end == 0)
+    debug_end = ieee->w.r.trailer_part;
+  if (debug_end == 0)
+    debug_end = ieee->w.r.me_record;
+  sec->_raw_size = debug_end - ieee->w.r.debug_information_part;
+
+  return true;
+}
+\f
  /***********************************************************************
  *  archive stuff
  */
  /***********************************************************************
  *  archive stuff
  */
@@ -1060,20 +1310,18 @@ ieee_archive_p (abfd)
       bfd *abfd;
  {
    char *library;
       bfd *abfd;
  {
    char *library;
-  boolean loop;
-
    unsigned int i;
    unsigned char buffer[512];
    unsigned int i;
    unsigned char buffer[512];
-  struct obstack ob;
    file_ptr buffer_offset = 0;
    ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
    ieee_ar_data_type *ieee;
    file_ptr buffer_offset = 0;
    ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
    ieee_ar_data_type *ieee;
-  abfd->tdata.ieee_ar_data = (ieee_ar_data_type *) bfd_alloc (abfd, sizeof (ieee_ar_data_type));
+  unsigned int alc_elts;
+  ieee_ar_obstack_type *elts = NULL;
+
+  abfd->tdata.ieee_ar_data =
+    (ieee_ar_data_type *) bfd_alloc (abfd, sizeof (ieee_ar_data_type));
    if (!abfd->tdata.ieee_ar_data)
    if (!abfd->tdata.ieee_ar_data)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
+    goto error_return;
    ieee = IEEE_AR_DATA (abfd);
  
    /* FIXME: Check return value.  I'm not sure whether it needs to read
    ieee = IEEE_AR_DATA (abfd);
  
    /* FIXME: Check return value.  I'm not sure whether it needs to read
@@ -1088,7 +1336,7 @@ ieee_archive_p (abfd)
    if (this_byte (&(ieee->h)) != Module_Beginning)
      {
        abfd->tdata.ieee_ar_data = save;
    if (this_byte (&(ieee->h)) != Module_Beginning)
      {
        abfd->tdata.ieee_ar_data = save;
-      return (const bfd_target *) NULL;
+      goto got_wrong_format_error;
      }
  
    next_byte (&(ieee->h));
      }
  
    next_byte (&(ieee->h));
@@ -1097,18 +1345,10 @@ ieee_archive_p (abfd)
      {
        bfd_release (abfd, ieee);
        abfd->tdata.ieee_ar_data = save;
      {
        bfd_release (abfd, ieee);
        abfd->tdata.ieee_ar_data = save;
-      return (const bfd_target *) NULL;
+      goto got_wrong_format_error;
      }
    /* Throw away the filename */
    read_id (&(ieee->h));
      }
    /* Throw away the filename */
    read_id (&(ieee->h));
-  /* This must be an IEEE archive, so we'll buy some space to do
-     things */
-
-  if (!obstack_begin (&ob, 128))
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (const bfd_target *) NULL;
-    }
  
    ieee->element_count = 0;
    ieee->element_index = 0;
  
    ieee->element_count = 0;
    ieee->element_index = 0;
@@ -1117,46 +1357,65 @@ ieee_archive_p (abfd)
    must_parse_int (&(ieee->h)); /* And the two dummy numbers */
    must_parse_int (&(ieee->h));
  
    must_parse_int (&(ieee->h)); /* And the two dummy numbers */
    must_parse_int (&(ieee->h));
  
-  loop = true;
+  alc_elts = 10;
+  elts = (ieee_ar_obstack_type *) bfd_malloc (alc_elts * sizeof *elts);
+  if (elts == NULL)
+    goto error_return;
+
    /* Read the index of the BB table */
    /* Read the index of the BB table */
-  while (loop)
+  while (1)
      {
      {
-      ieee_ar_obstack_type t;
-      int rec = read_2bytes (&(ieee->h));
-      if (rec == (int) ieee_assign_value_to_variable_enum)
+      int rec;
+      ieee_ar_obstack_type *t;
+
+      rec = read_2bytes (&(ieee->h));
+      if (rec != (int) ieee_assign_value_to_variable_enum)
+       break;
+
+      if (ieee->element_count >= alc_elts)
         {
         {
-         must_parse_int (&(ieee->h));
-         t.file_offset = must_parse_int (&(ieee->h));
-         t.abfd = (bfd *) NULL;
-         ieee->element_count++;
+         ieee_ar_obstack_type *n;
+
+         alc_elts *= 2;
+         n = ((ieee_ar_obstack_type *)
+              bfd_realloc (elts, alc_elts * sizeof *elts));
+         if (n == NULL)
+           goto error_return;
+         elts = n;
+       }
  
  
-         obstack_grow (&ob, (PTR) & t, sizeof (t));
+      t = &elts[ieee->element_count];
+      ieee->element_count++;
  
  
-         /* Make sure that we don't go over the end of the buffer */
+      must_parse_int (&(ieee->h));
+      t->file_offset = must_parse_int (&(ieee->h));
+      t->abfd = (bfd *) NULL;
  
  
-         if ((size_t) ieee_pos (abfd) > sizeof (buffer) / 2)
-           {
-             /* Past half way, reseek and reprime */
-             buffer_offset += ieee_pos (abfd);
-             if (bfd_seek (abfd, buffer_offset, SEEK_SET) != 0)
-               return NULL;
-             /* FIXME: Check return value.  I'm not sure whether it
-                needs to read the entire buffer or not.  */
-             bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
-             ieee->h.first_byte = buffer;
-             ieee->h.input_p = buffer;
-           }
+      /* Make sure that we don't go over the end of the buffer */
+
+      if ((size_t) ieee_pos (abfd) > sizeof (buffer) / 2)
+       {
+         /* Past half way, reseek and reprime */
+         buffer_offset += ieee_pos (abfd);
+         if (bfd_seek (abfd, buffer_offset, SEEK_SET) != 0)
+           goto error_return;
+         /* FIXME: Check return value.  I'm not sure whether it needs
+            to read the entire buffer or not.  */
+         bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
+         ieee->h.first_byte = buffer;
+         ieee->h.input_p = buffer;
         }
         }
-      else
-       loop = false;
      }
  
      }
  
-  ieee->elements = (ieee_ar_obstack_type *) obstack_finish (&ob);
-  if (!ieee->elements)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (const bfd_target *) NULL;
-    }
+  ieee->elements = ((ieee_ar_obstack_type *)
+                   bfd_alloc (abfd,
+                              ieee->element_count * sizeof *ieee->elements));
+  if (ieee->elements == NULL)
+    goto error_return;
+  memcpy (ieee->elements, elts,
+         ieee->element_count * sizeof *ieee->elements);
+  free (elts);
+  elts = NULL;
  
    /* Now scan the area again, and replace BB offsets with file */
    /* offsets */
  
    /* Now scan the area again, and replace BB offsets with file */
    /* offsets */
@@ -1164,7 +1423,7 @@ ieee_archive_p (abfd)
    for (i = 2; i < ieee->element_count; i++)
      {
        if (bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET) != 0)
    for (i = 2; i < ieee->element_count; i++)
      {
        if (bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET) != 0)
-       return NULL;
+       goto error_return;
        /* FIXME: Check return value.  I'm not sure whether it needs to
          read the entire buffer or not.  */
        bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
        /* FIXME: Check return value.  I'm not sure whether it needs to
          read the entire buffer or not.  */
        bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
@@ -1185,8 +1444,16 @@ ieee_archive_p (abfd)
         }
      }
  
         }
      }
  
-/*  abfd->has_armap = ;*/
+  /*  abfd->has_armap = ;*/
+
    return abfd->xvec;
    return abfd->xvec;
+
+ got_wrong_format_error:
+  bfd_set_error (bfd_error_wrong_format);
+ error_return:
+  if (elts != NULL)
+    free (elts);
+  return NULL;
  }
  
  static boolean
  }
  
  static boolean
@@ -1230,7 +1497,8 @@ ieee_object_p (abfd)
    ieee->external_reference_min_index = IEEE_REFERENCE_BASE;
    ieee->external_reference_max_index = 0;
    ieee->h.abfd = abfd;
    ieee->external_reference_min_index = IEEE_REFERENCE_BASE;
    ieee->external_reference_max_index = 0;
    ieee->h.abfd = abfd;
-  memset ((PTR) ieee->section_table, 0, sizeof (ieee->section_table));
+  ieee->section_table = NULL;
+  ieee->section_table_size = 0;
  
    processor = ieee->mb.processor = read_id (&(ieee->h));
    if (strcmp (processor, "LIBRARY") == 0)
  
    processor = ieee->mb.processor = read_id (&(ieee->h));
    if (strcmp (processor, "LIBRARY") == 0)
@@ -1243,7 +1511,70 @@ ieee_object_p (abfd)
    /* Determine the architecture and machine type of the object file.
       */
    {
    /* Determine the architecture and machine type of the object file.
       */
    {
-    bfd_arch_info_type *arch = bfd_scan_arch (processor);
+    const bfd_arch_info_type *arch;
+    char family[10];
+
+    /* IEEE does not specify the format of the processor identificaton
+       string, so the compiler is free to put in it whatever it wants.
+       We try here to recognize different processors belonging to the
+       m68k family.  Code for other processors can be added here.  */
+    if ((processor[0] == '6') && (processor[1] == '8'))
+      {
+       if (processor[2] == '3')            /* 683xx integrated processors */
+         {
+           switch (processor[3])
+             {
+             case '0':                     /* 68302, 68306, 68307 */
+             case '2':                     /* 68322, 68328 */
+             case '5':                     /* 68356 */
+               strcpy (family, "68000");   /* MC68000-based controllers */
+               break;
+
+             case '3':                     /* 68330, 68331, 68332, 68333,
+                                              68334, 68335, 68336, 68338 */
+             case '6':                     /* 68360 */
+             case '7':                     /* 68376 */
+               strcpy (family, "68332");   /* CPU32 and CPU32+ */
+               break;
+
+             case '4':
+               if (processor[4] == '9')    /* 68349 */
+                 strcpy (family, "68030"); /* CPU030 */
+               else                        /* 68340, 68341 */
+                 strcpy (family, "68332"); /* CPU32 and CPU32+ */
+               break;
+
+             default:                      /* Does not exist yet */
+               strcpy (family, "68332");   /* Guess it will be CPU32 */
+             }
+         }
+       else if (toupper (processor[3]) == 'F')   /* 68F333 */
+         strcpy (family, "68332");               /* CPU32 */
+       else if ((toupper (processor[3]) == 'C')  /* Embedded controllers */
+                && ((toupper (processor[2]) == 'E')
+                    || (toupper (processor[2]) == 'H')
+                    || (toupper (processor[2]) == 'L')))
+         {
+           strcpy (family, "68");
+           strncat (family, processor + 4, 7);
+           family[9] = '\0';
+         }
+       else                             /* "Regular" processors */
+         {
+           strncpy (family, processor, 9);
+           family[9] = '\0';
+         }
+      }
+    else if ((strncmp (processor, "cpu32", 5) == 0) /* CPU32 and CPU32+ */
+            || (strncmp (processor, "CPU32", 5) == 0))
+      strcpy (family, "68332");
+    else
+      {
+       strncpy (family, processor, 9);
+       family[9] = '\0';
+      }
+
+    arch = bfd_scan_arch (family);
      if (arch == 0)
        goto got_wrong_format;
      abfd->arch_info = arch;
      if (arch == 0)
        goto got_wrong_format;
      abfd->arch_info = arch;
@@ -1288,26 +1619,37 @@ ieee_object_p (abfd)
         }
  
      }
         }
  
      }
-  abfd->flags = HAS_SYMS;
-/* By now we know that this is a real IEEE file, we're going to read
-   the whole thing into memory so that we can run up and down it
-   quickly. We can work out how big the file is from the trailer
-   record */
  
  
-  IEEE_DATA (abfd)->h.first_byte = (unsigned char *) bfd_alloc (ieee->h.abfd, ieee->w.r.me_record
-                                                               + 50);
+  if (ieee->w.r.external_part != 0)
+    abfd->flags = HAS_SYMS;
+
+  /* By now we know that this is a real IEEE file, we're going to read
+     the whole thing into memory so that we can run up and down it
+     quickly.  We can work out how big the file is from the trailer
+     record */
+
+  IEEE_DATA (abfd)->h.first_byte =
+    (unsigned char *) bfd_alloc (ieee->h.abfd, ieee->w.r.me_record + 1);
    if (!IEEE_DATA (abfd)->h.first_byte)
    if (!IEEE_DATA (abfd)->h.first_byte)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      goto fail;
-    }
+    goto fail;
    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
      goto fail;
    /* FIXME: Check return value.  I'm not sure whether it needs to read
       the entire buffer or not.  */
    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
      goto fail;
    /* FIXME: Check return value.  I'm not sure whether it needs to read
       the entire buffer or not.  */
-  bfd_read ((PTR) (IEEE_DATA (abfd)->h.first_byte), 1, ieee->w.r.me_record + 50, abfd);
+  bfd_read ((PTR) (IEEE_DATA (abfd)->h.first_byte), 1,
+           ieee->w.r.me_record + 1, abfd);
  
    ieee_slurp_sections (abfd);
  
    ieee_slurp_sections (abfd);
+
+  if (! ieee_slurp_debug (abfd))
+    goto fail;
+
+  /* Parse section data to activate file and section flags implied by
+     section contents. */
+
+  if (! ieee_slurp_section_data (abfd))
+    goto fail;
+    
    return abfd->xvec;
  got_wrong_format:
    bfd_set_error (bfd_error_wrong_format);
    return abfd->xvec;
  got_wrong_format:
    bfd_set_error (bfd_error_wrong_format);
@@ -1319,7 +1661,7 @@ fail:
  
  void
  ieee_get_symbol_info (ignore_abfd, symbol, ret)
  
  void
  ieee_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;
       asymbol *symbol;
       symbol_info *ret;
  {
       asymbol *symbol;
       symbol_info *ret;
  {
@@ -1332,7 +1674,7 @@ ieee_get_symbol_info (ignore_abfd, symbol, ret)
  
  void
  ieee_print_symbol (ignore_abfd, afile, symbol, how)
  
  void
  ieee_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;
       PTR afile;
       asymbol *symbol;
       bfd_print_symbol_type how;
       PTR afile;
       asymbol *symbol;
       bfd_print_symbol_type how;
@@ -1353,8 +1695,10 @@ ieee_print_symbol (ignore_abfd, afile, symbol, how)
        break;
      case bfd_print_symbol_all:
        {
        break;
      case bfd_print_symbol_all:
        {
-       CONST char *section_name = symbol->section == (asection *) NULL ?
-       (CONST char *) "*abs" : symbol->section->name;
+       const char *section_name =
+         (symbol->section == (asection *) NULL
+          ? "*abs"
+          : symbol->section->name);
         if (symbol->name[0] == ' ')
           {
             fprintf (file, "* empty table entry ");
         if (symbol->name[0] == ' ')
           {
             fprintf (file, "* empty table entry ");
@@ -1366,9 +1710,7 @@ ieee_print_symbol (ignore_abfd, afile, symbol, how)
             fprintf (file, " %-5s %04x %02x %s",
                      section_name,
                      (unsigned) ieee_symbol (symbol)->index,
             fprintf (file, " %-5s %04x %02x %s",
                      section_name,
                      (unsigned) ieee_symbol (symbol)->index,
-                    (unsigned) 0,      /*
-                                          aout_symbol(symbol)->desc & 0xffff,
-                                          aout_symbol(symbol)->other  & 0xff,*/
+                    (unsigned) 0,
                      symbol->name);
           }
        }
                      symbol->name);
           }
        }
@@ -1377,11 +1719,12 @@ ieee_print_symbol (ignore_abfd, afile, symbol, how)
  }
  
  static boolean
  }
  
  static boolean
-do_one (ieee, current_map, location_ptr, s)
+do_one (ieee, current_map, location_ptr, s, iterations)
       ieee_data_type *ieee;
       ieee_per_section_type *current_map;
       unsigned char *location_ptr;
       asection *s;
       ieee_data_type *ieee;
       ieee_per_section_type *current_map;
       unsigned char *location_ptr;
       asection *s;
+     int iterations;
  {
    switch (this_byte (&(ieee->h)))
      {
  {
    switch (this_byte (&(ieee->h)))
      {
@@ -1421,10 +1764,7 @@ do_one (ieee, current_map, location_ptr, s)
                   (ieee_reloc_type *) bfd_alloc (ieee->h.abfd,
                                                  sizeof (ieee_reloc_type));
                   if (!r)
                   (ieee_reloc_type *) bfd_alloc (ieee->h.abfd,
                                                  sizeof (ieee_reloc_type));
                   if (!r)
-                   {
-                     bfd_set_error (bfd_error_no_memory);
-                     return false;
-                   }
+                   return false;
  
                   *(current_map->reloc_tail_ptr) = r;
                   current_map->reloc_tail_ptr = &r->next;
  
                   *(current_map->reloc_tail_ptr) = r;
                   current_map->reloc_tail_ptr = &r->next;
@@ -1437,11 +1777,11 @@ do_one (ieee, current_map, location_ptr, s)
                                     &r->symbol,
                                     &pcrel, &extra, &section);
                   r->relent.address = current_map->pc;
                                     &r->symbol,
                                     &pcrel, &extra, &section);
                   r->relent.address = current_map->pc;
+                 s->flags |= SEC_RELOC;
+                 s->owner->flags |= HAS_RELOC;
                   s->reloc_count++;
                   s->reloc_count++;
-                 if (r->relent.sym_ptr_ptr == 0)
-                   {
-                     r->relent.sym_ptr_ptr = section->symbol_ptr_ptr;
-                   }
+                 if (r->relent.sym_ptr_ptr == NULL && section != NULL)
+                   r->relent.sym_ptr_ptr = section->symbol_ptr_ptr;
  
                   if (this_byte (&(ieee->h)) == (int) ieee_comma)
                     {
  
                   if (this_byte (&(ieee->h)) == (int) ieee_comma)
                     {
@@ -1466,12 +1806,10 @@ do_one (ieee, current_map, location_ptr, s)
                     }
                   /* Build a relocation entry for this type */
                   /* If pc rel then stick -ve pc into instruction
                     }
                   /* Build a relocation entry for this type */
                   /* If pc rel then stick -ve pc into instruction
-                              and take out of reloc ..
+                    and take out of reloc ..
  
  
-                              I've changed this. It's all too
-                              complicated. I keep 0 in the
-                              instruction  now.
-                              */
+                    I've changed this. It's all too complicated. I
+                    keep 0 in the instruction now.  */
  
                   switch (extra)
                     {
  
                   switch (extra)
                     {
@@ -1543,7 +1881,7 @@ do_one (ieee, current_map, location_ptr, s)
  
                     default:
                       BFD_FAIL ();
  
                     default:
                       BFD_FAIL ();
-                     break;
+                     return false;
                     }
                 }
                 break;
                     }
                 }
                 break;
@@ -1565,6 +1903,11 @@ do_one (ieee, current_map, location_ptr, s)
                     }
                 }
               }
                     }
                 }
               }
+
+           /* Prevent more than the first load-item of an LR record
+              from being repeated (MRI convention). */
+           if (iterations != 1)
+             loop = false;
           }
        }
      }
           }
        }
      }
@@ -1593,12 +1936,11 @@ ieee_slurp_section_data (abfd)
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
        ieee_per_section_type *per = (ieee_per_section_type *) s->used_by_bfd;
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
        ieee_per_section_type *per = (ieee_per_section_type *) s->used_by_bfd;
+      if ((s->flags & SEC_DEBUGGING) != 0)
+       continue;
        per->data = (bfd_byte *) bfd_alloc (ieee->h.abfd, s->_raw_size);
        if (!per->data)
        per->data = (bfd_byte *) bfd_alloc (ieee->h.abfd, s->_raw_size);
        if (!per->data)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
+       return false;
        /*SUPPRESS 68*/
        per->reloc_tail_ptr =
         (ieee_reloc_type **) & (s->relocation);
        /*SUPPRESS 68*/
        per->reloc_tail_ptr =
         (ieee_reloc_type **) & (s->relocation);
@@ -1616,6 +1958,7 @@ ieee_slurp_section_data (abfd)
           next_byte (&(ieee->h));
           section_number = must_parse_int (&(ieee->h));
           s = ieee->section_table[section_number];
           next_byte (&(ieee->h));
           section_number = must_parse_int (&(ieee->h));
           s = ieee->section_table[section_number];
+         s->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
           current_map = (ieee_per_section_type *) s->used_by_bfd;
           location_ptr = current_map->data - s->vma;
           /* The document I have says that Microtec's compilers reset */
           current_map = (ieee_per_section_type *) s->used_by_bfd;
           location_ptr = current_map->data - s->vma;
           /* The document I have says that Microtec's compilers reset */
@@ -1646,11 +1989,15 @@ ieee_slurp_section_data (abfd)
               break;
  
             case ieee_value_starting_address_enum & 0xff:
               break;
  
             case ieee_value_starting_address_enum & 0xff:
+             next_byte (&(ieee->h));
+             if (this_byte (&(ieee->h)) == ieee_function_either_open_b_enum)
+               next_byte (&(ieee->h));
+             abfd->start_address = must_parse_int (&(ieee->h));
               /* We've got to the end of the data now - */
               return true;
             default:
               BFD_FAIL ();
               /* We've got to the end of the data now - */
               return true;
             default:
               BFD_FAIL ();
-             return true;
+             return false;
             }
           break;
         case ieee_repeat_data_enum:
             }
           break;
         case ieee_repeat_data_enum:
@@ -1683,7 +2030,8 @@ ieee_slurp_section_data (abfd)
                 while (iterations != 0)
                   {
                     ieee->h.input_p = start;
                 while (iterations != 0)
                   {
                     ieee->h.input_p = start;
-                   if (!do_one (ieee, current_map, location_ptr, s))
+                   if (!do_one (ieee, current_map, location_ptr, s,
+                                iterations))
                       return false;
                     iterations--;
                   }
                       return false;
                     iterations--;
                   }
@@ -1693,7 +2041,7 @@ ieee_slurp_section_data (abfd)
         case ieee_load_constant_bytes_enum:
         case ieee_load_with_relocation_enum:
           {
         case ieee_load_constant_bytes_enum:
         case ieee_load_with_relocation_enum:
           {
-           if (!do_one (ieee, current_map, location_ptr, s))
+           if (!do_one (ieee, current_map, location_ptr, s, 1))
               return false;
           }
         }
               return false;
           }
         }
@@ -1708,10 +2056,7 @@ ieee_new_section_hook (abfd, newsect)
    newsect->used_by_bfd = (PTR)
      bfd_alloc (abfd, sizeof (ieee_per_section_type));
    if (!newsect->used_by_bfd)
    newsect->used_by_bfd = (PTR)
      bfd_alloc (abfd, sizeof (ieee_per_section_type));
    if (!newsect->used_by_bfd)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
    ieee_per_section (newsect)->data = (bfd_byte *) NULL;
    ieee_per_section (newsect)->section = newsect;
    return true;
    ieee_per_section (newsect)->data = (bfd_byte *) NULL;
    ieee_per_section (newsect)->section = newsect;
    return true;
@@ -1722,6 +2067,8 @@ ieee_get_reloc_upper_bound (abfd, asect)
       bfd *abfd;
       sec_ptr asect;
  {
       bfd *abfd;
       sec_ptr asect;
  {
+  if ((asect->flags & SEC_DEBUGGING) != 0)
+    return 0;
    if (! ieee_slurp_section_data (abfd))
      return -1;
    return (asect->reloc_count + 1) * sizeof (arelent *);
    if (! ieee_slurp_section_data (abfd))
      return -1;
    return (asect->reloc_count + 1) * sizeof (arelent *);
@@ -1736,6 +2083,9 @@ ieee_get_section_contents (abfd, section, location, offset, count)
       bfd_size_type count;
  {
    ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;
       bfd_size_type count;
  {
    ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    return _bfd_generic_get_section_contents (abfd, section, location,
+                                             offset, count);
    ieee_slurp_section_data (abfd);
    (void) memcpy ((PTR) location, (PTR) (p->data + offset), (unsigned) count);
    return true;
    ieee_slurp_section_data (abfd);
    (void) memcpy ((PTR) location, (PTR) (p->data + offset), (unsigned) count);
    return true;
@@ -1752,18 +2102,26 @@ ieee_canonicalize_reloc (abfd, section, relptr, symbols)
    ieee_reloc_type *src = (ieee_reloc_type *) (section->relocation);
    ieee_data_type *ieee = IEEE_DATA (abfd);
  
    ieee_reloc_type *src = (ieee_reloc_type *) (section->relocation);
    ieee_data_type *ieee = IEEE_DATA (abfd);
  
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    return 0;
+
    while (src != (ieee_reloc_type *) NULL)
      {
        /* Work out which symbol to attach it this reloc to */
        switch (src->symbol.letter)
         {
    while (src != (ieee_reloc_type *) NULL)
      {
        /* Work out which symbol to attach it this reloc to */
        switch (src->symbol.letter)
         {
+       case 'I':
+         src->relent.sym_ptr_ptr =
+           symbols + src->symbol.index + ieee->external_symbol_base_offset;
+         break;
         case 'X':
           src->relent.sym_ptr_ptr =
             symbols + src->symbol.index + ieee->external_reference_base_offset;
           break;
         case 0:
         case 'X':
           src->relent.sym_ptr_ptr =
             symbols + src->symbol.index + ieee->external_reference_base_offset;
           break;
         case 0:
-         src->relent.sym_ptr_ptr =
-           src->relent.sym_ptr_ptr[0]->section->symbol_ptr_ptr;
+         if (src->relent.sym_ptr_ptr != NULL)
+           src->relent.sym_ptr_ptr =
+             src->relent.sym_ptr_ptr[0]->section->symbol_ptr_ptr;
           break;
         default:
  
           break;
         default:
  
@@ -1786,11 +2144,9 @@ comp (ap, bp)
    return a->address - b->address;
  }
  
    return a->address - b->address;
  }
  
-/*
-Write the section headers
-*/
+/* Write the section headers.  */
  
  
-static void
+static boolean
  ieee_write_section_part (abfd)
       bfd *abfd;
  {
  ieee_write_section_part (abfd)
       bfd *abfd;
  {
@@ -1799,68 +2155,87 @@ ieee_write_section_part (abfd)
    ieee->w.r.section_part = bfd_tell (abfd);
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
    ieee->w.r.section_part = bfd_tell (abfd);
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
-      if (! bfd_is_abs_section (s))
+      if (! bfd_is_abs_section (s)
+         && (s->flags & SEC_DEBUGGING) == 0)
         {
         {
-         ieee_write_byte (abfd, ieee_section_type_enum);
-         ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
+         if (! ieee_write_byte (abfd, ieee_section_type_enum)
+             || ! ieee_write_byte (abfd,
+                                   (bfd_byte) (s->index
+                                               + IEEE_SECTION_NUMBER_BASE)))
+           return false;
  
           if (abfd->flags & EXEC_P)
             {
               /* This image is executable, so output absolute sections */
  
           if (abfd->flags & EXEC_P)
             {
               /* This image is executable, so output absolute sections */
-             ieee_write_byte (abfd, ieee_variable_A_enum);
-             ieee_write_byte (abfd, ieee_variable_S_enum);
+             if (! ieee_write_byte (abfd, ieee_variable_A_enum)
+                 || ! ieee_write_byte (abfd, ieee_variable_S_enum))
+               return false;
             }
           else
             {
             }
           else
             {
-             ieee_write_byte (abfd, ieee_variable_C_enum);
+             if (! ieee_write_byte (abfd, ieee_variable_C_enum))
+               return false;
             }
  
           switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
             {
             case SEC_CODE | SEC_LOAD:
             case SEC_CODE:
             }
  
           switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
             {
             case SEC_CODE | SEC_LOAD:
             case SEC_CODE:
-             ieee_write_byte (abfd, ieee_variable_P_enum);
+             if (! ieee_write_byte (abfd, ieee_variable_P_enum))
+               return false;
               break;
             case SEC_DATA:
             default:
               break;
             case SEC_DATA:
             default:
-             ieee_write_byte (abfd, ieee_variable_D_enum);
+             if (! ieee_write_byte (abfd, ieee_variable_D_enum))
+               return false;
               break;
             case SEC_ROM:
             case SEC_ROM | SEC_DATA:
             case SEC_ROM | SEC_LOAD:
             case SEC_ROM | SEC_DATA | SEC_LOAD:
               break;
             case SEC_ROM:
             case SEC_ROM | SEC_DATA:
             case SEC_ROM | SEC_LOAD:
             case SEC_ROM | SEC_DATA | SEC_LOAD:
-
-             ieee_write_byte (abfd, ieee_variable_R_enum);
+             if (! ieee_write_byte (abfd, ieee_variable_R_enum))
+               return false;
             }
  
  
             }
  
  
-         ieee_write_id (abfd, s->name);
+         if (! ieee_write_id (abfd, s->name))
+           return false;
  #if 0
           ieee_write_int (abfd, 0);     /* Parent */
           ieee_write_int (abfd, 0);     /* Brother */
           ieee_write_int (abfd, 0);     /* Context */
  #endif
           /* Alignment */
  #if 0
           ieee_write_int (abfd, 0);     /* Parent */
           ieee_write_int (abfd, 0);     /* Brother */
           ieee_write_int (abfd, 0);     /* Context */
  #endif
           /* Alignment */
-         ieee_write_byte (abfd, ieee_section_alignment_enum);
-         ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-         ieee_write_int (abfd, 1 << s->alignment_power);
+         if (! ieee_write_byte (abfd, ieee_section_alignment_enum)
+             || ! ieee_write_byte (abfd,
+                                   (bfd_byte) (s->index
+                                               + IEEE_SECTION_NUMBER_BASE))
+             || ! ieee_write_int (abfd, 1 << s->alignment_power))
+           return false;
  
           /* Size */
  
           /* Size */
-         ieee_write_2bytes (abfd, ieee_section_size_enum);
-         ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-         ieee_write_int (abfd, s->_raw_size);
+         if (! ieee_write_2bytes (abfd, ieee_section_size_enum)
+             || ! ieee_write_byte (abfd,
+                                   (bfd_byte) (s->index
+                                               + IEEE_SECTION_NUMBER_BASE))
+             || ! ieee_write_int (abfd, s->_raw_size))
+           return false;
           if (abfd->flags & EXEC_P)
             {
               /* Relocateable sections don't have asl records */
               /* Vma */
           if (abfd->flags & EXEC_P)
             {
               /* Relocateable sections don't have asl records */
               /* Vma */
-             ieee_write_2bytes (abfd, ieee_section_base_address_enum);
-             ieee_write_byte (abfd,
-                         (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-             ieee_write_int (abfd, s->vma);
+             if (! ieee_write_2bytes (abfd, ieee_section_base_address_enum)
+                 || ! ieee_write_byte (abfd,
+                                       ((bfd_byte)
+                                        (s->index
+                                         + IEEE_SECTION_NUMBER_BASE)))
+                 || ! ieee_write_int (abfd, s->lma))
+               return false;
             }
         }
             }
         }
-
      }
      }
+
+  return true;
  }
  
  
  }
  
  
@@ -1869,11 +2244,11 @@ do_with_relocs (abfd, s)
       bfd *abfd;
       asection *s;
  {
       bfd *abfd;
       asection *s;
  {
+  unsigned int number_of_maus_in_address =
+    bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd);
    unsigned int relocs_to_go = s->reloc_count;
    unsigned int relocs_to_go = s->reloc_count;
-
    bfd_byte *stream = ieee_per_section (s)->data;
    arelent **p = s->orelocation;
    bfd_byte *stream = ieee_per_section (s)->data;
    arelent **p = s->orelocation;
-
    bfd_size_type current_byte_index = 0;
  
    qsort (s->orelocation,
    bfd_size_type current_byte_index = 0;
  
    qsort (s->orelocation,
@@ -1882,22 +2257,33 @@ do_with_relocs (abfd, s)
          comp);
  
    /* Output the section preheader */
          comp);
  
    /* Output the section preheader */
-  ieee_write_byte (abfd, ieee_set_current_section_enum);
-  ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-
-  ieee_write_twobyte (abfd, ieee_set_current_pc_enum);
-  ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-  ieee_write_expression (abfd, 0, s->symbol, 0, 0);
+  if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+      || ! ieee_write_byte (abfd,
+                           (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE))
+      || ! ieee_write_2bytes (abfd, ieee_set_current_pc_enum)
+      || ! ieee_write_byte (abfd,
+                           (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE)))
+    return false;
+  if ((abfd->flags & EXEC_P) != 0 && relocs_to_go == 0)
+    {
+      if (! ieee_write_int (abfd, s->lma))
+       return false;
+    }
+  else
+    {
+      if (! ieee_write_expression (abfd, 0, s->symbol, 0, 0))
+       return false;
+    }
  
    if (relocs_to_go == 0)
      {
  
    if (relocs_to_go == 0)
      {
-      /* If there arn't any relocations then output the load constant byte
-          opcode rather than the load with relocation opcode */
+      /* If there aren't any relocations then output the load constant
+        byte opcode rather than the load with relocation opcode */
  
        while (current_byte_index < s->_raw_size)
         {
           bfd_size_type run;
  
        while (current_byte_index < s->_raw_size)
         {
           bfd_size_type run;
-         unsigned int MAXRUN = 32;
+         unsigned int MAXRUN = 127;
           run = MAXRUN;
           if (run > s->_raw_size - current_byte_index)
             {
           run = MAXRUN;
           if (run > s->_raw_size - current_byte_index)
             {
@@ -1906,9 +2292,11 @@ do_with_relocs (abfd, s)
  
           if (run != 0)
             {
  
           if (run != 0)
             {
-             ieee_write_byte (abfd, ieee_load_constant_bytes_enum);
+             if (! ieee_write_byte (abfd, ieee_load_constant_bytes_enum))
+               return false;
               /* Output a stream of bytes */
               /* Output a stream of bytes */
-             ieee_write_int (abfd, run);
+             if (! ieee_write_int (abfd, run))
+               return false;
               if (bfd_write ((PTR) (stream + current_byte_index),
                              1,
                              run,
               if (bfd_write ((PTR) (stream + current_byte_index),
                              1,
                              run,
@@ -1921,31 +2309,30 @@ do_with_relocs (abfd, s)
      }
    else
      {
      }
    else
      {
-      ieee_write_byte (abfd, ieee_load_with_relocation_enum);
-
+      if (! ieee_write_byte (abfd, ieee_load_with_relocation_enum))
+       return false;
  
        /* Output the data stream as the longest sequence of bytes
  
        /* Output the data stream as the longest sequence of bytes
-          possible, allowing for the a reasonable packet size and
-          relocation stuffs */
+        possible, allowing for the a reasonable packet size and
+        relocation stuffs.  */
  
        if ((PTR) stream == (PTR) NULL)
         {
           /* Outputting a section without data, fill it up */
           stream = (unsigned char *) (bfd_alloc (abfd, s->_raw_size));
           if (!stream)
  
        if ((PTR) stream == (PTR) NULL)
         {
           /* Outputting a section without data, fill it up */
           stream = (unsigned char *) (bfd_alloc (abfd, s->_raw_size));
           if (!stream)
-           {
-             bfd_set_error (bfd_error_no_memory);
-             return false;
-           }
+           return false;
           memset ((PTR) stream, 0, (size_t) s->_raw_size);
         }
        while (current_byte_index < s->_raw_size)
         {
           bfd_size_type run;
           memset ((PTR) stream, 0, (size_t) s->_raw_size);
         }
        while (current_byte_index < s->_raw_size)
         {
           bfd_size_type run;
-         unsigned int MAXRUN = 32;
+         unsigned int MAXRUN = 127;
           if (relocs_to_go)
             {
               run = (*p)->address - current_byte_index;
           if (relocs_to_go)
             {
               run = (*p)->address - current_byte_index;
+             if (run > MAXRUN)
+               run = MAXRUN;
             }
           else
             {
             }
           else
             {
@@ -1959,7 +2346,8 @@ do_with_relocs (abfd, s)
           if (run != 0)
             {
               /* Output a stream of bytes */
           if (run != 0)
             {
               /* Output a stream of bytes */
-             ieee_write_int (abfd, run);
+             if (! ieee_write_int (abfd, run))
+               return false;
               if (bfd_write ((PTR) (stream + current_byte_index),
                              1,
                              run,
               if (bfd_write ((PTR) (stream + current_byte_index),
                              1,
                              run,
@@ -1971,11 +2359,11 @@ do_with_relocs (abfd, s)
           /* Output any relocations here */
           if (relocs_to_go && (*p) && (*p)->address == current_byte_index)
             {
           /* Output any relocations here */
           if (relocs_to_go && (*p) && (*p)->address == current_byte_index)
             {
-             while (relocs_to_go && (*p) && (*p)->address == current_byte_index)
+             while (relocs_to_go
+                    && (*p) && (*p)->address == current_byte_index)
                 {
                 {
-
                   arelent *r = *p;
                   arelent *r = *p;
-                 bfd_vma ov;
+                 bfd_signed_vma ov;
  
  #if 0
                   if (r->howto->pc_relative)
  
  #if 0
                   if (r->howto->pc_relative)
@@ -1988,47 +2376,65 @@ do_with_relocs (abfd, s)
                     {
                     case 2:
  
                     {
                     case 2:
  
-                     ov = bfd_get_32 (abfd,
-                                      stream + current_byte_index);
+                     ov = bfd_get_signed_32 (abfd,
+                                             stream + current_byte_index);
                       current_byte_index += 4;
                       break;
                     case 1:
                       current_byte_index += 4;
                       break;
                     case 1:
-                     ov = bfd_get_16 (abfd,
-                                      stream + current_byte_index);
+                     ov = bfd_get_signed_16 (abfd,
+                                             stream + current_byte_index);
                       current_byte_index += 2;
                       break;
                     case 0:
                       current_byte_index += 2;
                       break;
                     case 0:
-                     ov = bfd_get_8 (abfd,
-                                     stream + current_byte_index);
+                     ov = bfd_get_signed_8 (abfd,
+                                            stream + current_byte_index);
                       current_byte_index++;
                       break;
                     default:
                       ov = 0;
                       BFD_FAIL ();
                       current_byte_index++;
                       break;
                     default:
                       ov = 0;
                       BFD_FAIL ();
+                     return false;
                     }
                     }
-                 ieee_write_byte (abfd, ieee_function_either_open_b_enum);
-/*           abort();*/
+
+                 ov &= r->howto->src_mask;
+
+                 if (r->howto->pc_relative
+                     && ! r->howto->pcrel_offset)
+                   ov += r->address;
+
+                 if (! ieee_write_byte (abfd,
+                                        ieee_function_either_open_b_enum))
+                   return false;
+
+/*               abort();*/
  
                   if (r->sym_ptr_ptr != (asymbol **) NULL)
                     {
  
                   if (r->sym_ptr_ptr != (asymbol **) NULL)
                     {
-                     ieee_write_expression (abfd, r->addend + ov,
-                                            *(r->sym_ptr_ptr),
-                                          r->howto->pc_relative, s->index);
+                     if (! ieee_write_expression (abfd, r->addend + ov,
+                                                  *(r->sym_ptr_ptr),
+                                                  r->howto->pc_relative,
+                                                  s->index))
+                       return false;
                     }
                   else
                     {
                     }
                   else
                     {
-                     ieee_write_expression (abfd, r->addend + ov,
-                                            (asymbol *) NULL,
-                                          r->howto->pc_relative, s->index);
+                     if (! ieee_write_expression (abfd, r->addend + ov,
+                                                  (asymbol *) NULL,
+                                                  r->howto->pc_relative,
+                                                  s->index))
+                       return false;
                     }
  
                     }
  
-                 if (1 || r->howto->size != 2)
+                 if (number_of_maus_in_address
+                     != bfd_get_reloc_size (r->howto))
                     {
                     {
-                     ieee_write_byte (abfd, ieee_comma);
-                     ieee_write_int (abfd, 1 << r->howto->size);
+                     if (! ieee_write_int (abfd,
+                                           bfd_get_reloc_size (r->howto)))
+                       return false;
                     }
                     }
-                 ieee_write_byte (abfd,
-                                  ieee_function_either_close_b_enum);
+                 if (! ieee_write_byte (abfd,
+                                        ieee_function_either_close_b_enum))
+                   return false;
  
                   relocs_to_go--;
                   p++;
  
                   relocs_to_go--;
                   p++;
@@ -2037,36 +2443,43 @@ do_with_relocs (abfd, s)
             }
         }
      }
             }
         }
      }
+
    return true;
  }
  
    return true;
  }
  
-/* If there are no relocations in the output section then we can
-be clever about how we write. We block items up into a max of 127
-bytes */
+/* If there are no relocations in the output section then we can be
+   clever about how we write.  We block items up into a max of 127
+   bytes.  */
  
  
-static void
+static boolean
  do_as_repeat (abfd, s)
       bfd *abfd;
       asection *s;
  {
    if (s->_raw_size)
      {
  do_as_repeat (abfd, s)
       bfd *abfd;
       asection *s;
  {
    if (s->_raw_size)
      {
-      ieee_write_byte (abfd, ieee_set_current_section_enum);
-      ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-      ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8);
-      ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff);
-      ieee_write_byte (abfd, (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE));
-      ieee_write_int (abfd, s->vma);
-
-      ieee_write_byte (abfd, ieee_repeat_data_enum);
-      ieee_write_int (abfd, s->_raw_size);
-      ieee_write_byte (abfd, ieee_load_constant_bytes_enum);
-      ieee_write_byte (abfd, 1);
-      ieee_write_byte (abfd, 0);
+      if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+         || ! ieee_write_byte (abfd,
+                               (bfd_byte) (s->index
+                                           + IEEE_SECTION_NUMBER_BASE))
+         || ! ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8)
+         || ! ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff)
+         || ! ieee_write_byte (abfd,
+                               (bfd_byte) (s->index
+                                           + IEEE_SECTION_NUMBER_BASE))
+         || ! ieee_write_int (abfd, s->lma)
+         || ! ieee_write_byte (abfd, ieee_repeat_data_enum)
+         || ! ieee_write_int (abfd, s->_raw_size)
+         || ! ieee_write_byte (abfd, ieee_load_constant_bytes_enum)
+         || ! ieee_write_byte (abfd, 1)
+         || ! ieee_write_byte (abfd, 0))
+       return false;
      }
      }
+
+  return true;
  }
  
  }
  
-static void
+static boolean
  do_without_relocs (abfd, s)
       bfd *abfd;
       asection *s;
  do_without_relocs (abfd, s)
       bfd *abfd;
       asection *s;
@@ -2075,7 +2488,8 @@ do_without_relocs (abfd, s)
  
    if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
      {
  
    if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
      {
-      do_as_repeat (abfd, s);
+      if (! do_as_repeat (abfd, s))
+       return false;
      }
    else
      {
      }
    else
      {
@@ -2084,13 +2498,16 @@ do_without_relocs (abfd, s)
         {
           if (stream[i] != 0)
             {
         {
           if (stream[i] != 0)
             {
-             do_with_relocs (abfd, s);
-             return;
+             if (! do_with_relocs (abfd, s))
+               return false;
+             return true;
             }
         }
             }
         }
-      do_as_repeat (abfd, s);
+      if (! do_as_repeat (abfd, s))
+       return false;
      }
  
      }
  
+  return true;
  }
  
  
  }
  
  
@@ -2270,7 +2687,7 @@ copy_expression ()
             s = ieee->section_table[section_number];
             if (s->output_section)
               {
             s = ieee->section_table[section_number];
             if (s->output_section)
               {
-               value = s->output_section->vma;
+               value = s->output_section->lma;
               }
             else
               {
               }
             else
               {
@@ -2755,7 +3172,7 @@ block ()
  
  static void
  relocate_debug (output, input)
  
  static void
  relocate_debug (output, input)
-     bfd *output;
+     bfd *output ATTRIBUTE_UNUSED;
       bfd *input;
  {
  #define IBS 400
       bfd *input;
  {
  #define IBS 400
@@ -2777,7 +3194,7 @@ relocate_debug (output, input)
    the debug info in each, and copy it out, relocating it as we go.
  */
  
    the debug info in each, and copy it out, relocating it as we go.
  */
  
-static void
+static boolean
  ieee_write_debug_part (abfd)
       bfd *abfd;
  {
  ieee_write_debug_part (abfd)
       bfd *abfd;
  {
@@ -2794,49 +3211,20 @@ ieee_write_debug_part (abfd)
  
    if (chain == (bfd_chain_type *) NULL)
      {
  
    if (chain == (bfd_chain_type *) NULL)
      {
-#if 0
-      /* There is no debug info, so we'll fake some up */
-      CONST static char fake[] =
-      {
-       0xf8, 0xa, 0, 5, 't', 't', 't', 't', 't', 0, 2, 3,
-       '1', '.', '1', 0x82, 1991 >> 8, 1991 & 0xff, 9, 20, 11, 07, 50};
-      ieee->w.r.debug_information_part = 0;
-
-
-      here;
-
-
-      /*    bfd_write(fake, 1, sizeof(fake), abfd);*/
-      /* Now write a header for each section */
-      {
-       int i = 0;
-       asection *s = abfd->sections;
-       while (s)
-         {
-           if (s != abfd->abs_section)
-             {
-
-               ieee_write_byte (abfd, 0xf8);
-               ieee_write_byte (abfd, 0x0b);
-               ieee_write_byte (abfd, 0);
-               ieee_write_byte (abfd, 0);
-               ieee_write_byte (abfd, 1);
-               ieee_write_byte (abfd, i + IEEE_SECTION_NUMBER_BASE);
-               ieee_write_expression (abfd, 0, s->symbol, 0, 0, 0);
-               ieee_write_byte (abfd, 0);
-               ieee_write_byte (abfd, 0xf9);
-               ieee_write_expression (abfd, s->size,
-                                      bfd_abs_section_ptr->symbol, 0, 0, 0);
-               i++;
-             }
+      asection *s;
  
  
-           s = s->next;
+      for (s = abfd->sections; s != NULL; s = s->next)
+       if ((s->flags & SEC_DEBUGGING) != 0)
+         break;
+      if (s == NULL)
+       {
+         ieee->w.r.debug_information_part = 0;
+         return true;
+       }
  
  
-         }
-       /* Close the scope */
-       ieee_write_byte (abfd, 0xf9);
-      }
-#endif
+      ieee->w.r.debug_information_part = here;
+      if (bfd_write (s->contents, 1, s->_raw_size, abfd) != s->_raw_size)
+       return false;
      }
    else
      {
      }
    else
      {
@@ -2849,7 +3237,7 @@ ieee_write_debug_part (abfd)
               if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
                             SEEK_SET)
                   != 0)
               if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
                             SEEK_SET)
                   != 0)
-               abort ();
+               return false;
               relocate_debug (abfd, entry);
             }
  
               relocate_debug (abfd, entry);
             }
  
@@ -2863,13 +3251,16 @@ ieee_write_debug_part (abfd)
         {
           ieee->w.r.debug_information_part = 0;
         }
         {
           ieee->w.r.debug_information_part = 0;
         }
+
+      flush ();
      }
      }
-  flush ();
  
  
+  return true;
  }
  
  }
  
-/* write the data in an ieee way */
-static void
+/* Write the data in an ieee way.  */
+
+static boolean
  ieee_write_data_part (abfd)
       bfd *abfd;
  {
  ieee_write_data_part (abfd)
       bfd *abfd;
  {
@@ -2878,17 +3269,26 @@ ieee_write_data_part (abfd)
    ieee->w.r.data_part = bfd_tell (abfd);
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
    ieee->w.r.data_part = bfd_tell (abfd);
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
+      /* Skip sections that have no loadable contents (.bss,
+         debugging, etc.)  */
+      if ((s->flags & SEC_LOAD) == 0)
+       continue;
+
        /* Sort the reloc records so we can insert them in the correct
        /* Sort the reloc records so we can insert them in the correct
-          places */
+        places */
        if (s->reloc_count != 0)
         {
        if (s->reloc_count != 0)
         {
-         do_with_relocs (abfd, s);
+         if (! do_with_relocs (abfd, s))
+           return false;
         }
        else
         {
         }
        else
         {
-         do_without_relocs (abfd, s);
+         if (! do_without_relocs (abfd, s))
+           return false;
         }
      }
         }
      }
+
+  return true;
  }
  
  
  }
  
  
@@ -2899,14 +3299,13 @@ init_for_output (abfd)
    asection *s;
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
    asection *s;
    for (s = abfd->sections; s != (asection *) NULL; s = s->next)
      {
+      if ((s->flags & SEC_DEBUGGING) != 0)
+       continue;
        if (s->_raw_size != 0)
         {
           ieee_per_section (s)->data = (bfd_byte *) (bfd_alloc (abfd, s->_raw_size));
           if (!ieee_per_section (s)->data)
        if (s->_raw_size != 0)
         {
           ieee_per_section (s)->data = (bfd_byte *) (bfd_alloc (abfd, s->_raw_size));
           if (!ieee_per_section (s)->data)
-           {
-             bfd_set_error (bfd_error_no_memory);
-             return false;
-           }
+           return false;
         }
      }
    return true;
         }
      }
    return true;
@@ -2925,6 +3324,21 @@ ieee_set_section_contents (abfd, section, location, offset, count)
       file_ptr offset;
       bfd_size_type count;
  {
       file_ptr offset;
       bfd_size_type count;
  {
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    {
+      if (section->contents == NULL)
+       {
+         section->contents = ((unsigned char *)
+                              bfd_alloc (abfd, section->_raw_size));
+         if (section->contents == NULL)
+           return false;
+       }
+      /* bfd_set_section_contents has already checked that everything
+         is within range.  */
+      memcpy (section->contents + offset, location, count);
+      return true;
+    }
+
    if (ieee_per_section (section)->data == (bfd_byte *) NULL)
      {
        if (!init_for_output (abfd))
    if (ieee_per_section (section)->data == (bfd_byte *) NULL)
      {
        if (!init_for_output (abfd))
@@ -2936,13 +3350,12 @@ ieee_set_section_contents (abfd, section, location, offset, count)
    return true;
  }
  
    return true;
  }
  
-/*
-write the external symbols of a file, IEEE considers two sorts of
-external symbols, public, and referenced. It uses to internal forms
-to index them as well. When we write them out we turn their symbol
-values into indexes from the right base.
-*/
-static void
+/* Write the external symbols of a file.  IEEE considers two sorts of
+   external symbols, public, and referenced.  It uses to internal
+   forms to index them as well.  When we write them out we turn their
+   symbol values into indexes from the right base.  */
+
+static boolean
  ieee_write_external_part (abfd)
       bfd *abfd;
  {
  ieee_write_external_part (abfd)
       bfd *abfd;
  {
@@ -2959,75 +3372,84 @@ ieee_write_external_part (abfd)
        for (q = abfd->outsymbols; *q != (asymbol *) NULL; q++)
         {
           asymbol *p = *q;
        for (q = abfd->outsymbols; *q != (asymbol *) NULL; q++)
         {
           asymbol *p = *q;
-         hadone = true;
           if (bfd_is_und_section (p->section))
             {
               /* This must be a symbol reference .. */
           if (bfd_is_und_section (p->section))
             {
               /* This must be a symbol reference .. */
-             ieee_write_byte (abfd, ieee_external_reference_enum);
-             ieee_write_int (abfd, reference_index);
-             ieee_write_id (abfd, p->name);
+             if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+                 || ! ieee_write_int (abfd, reference_index)
+                 || ! ieee_write_id (abfd, p->name))
+               return false;
               p->value = reference_index;
               reference_index++;
               p->value = reference_index;
               reference_index++;
+             hadone = true;
             }
           else if (bfd_is_com_section (p->section))
             {
               /* This is a weak reference */
             }
           else if (bfd_is_com_section (p->section))
             {
               /* This is a weak reference */
-             ieee_write_byte (abfd, ieee_external_reference_enum);
-             ieee_write_int (abfd, reference_index);
-             ieee_write_id (abfd, p->name);
-             ieee_write_byte (abfd, ieee_weak_external_reference_enum);
-             ieee_write_int (abfd, reference_index);
-             ieee_write_int (abfd, p->value);
-             ieee_write_int (abfd, BFD_FORT_COMM_DEFAULT_VALUE);
+             if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+                 || ! ieee_write_int (abfd, reference_index)
+                 || ! ieee_write_id (abfd, p->name)
+                 || ! ieee_write_byte (abfd,
+                                       ieee_weak_external_reference_enum)
+                 || ! ieee_write_int (abfd, reference_index)
+                 || ! ieee_write_int (abfd, p->value))
+               return false;
               p->value = reference_index;
               reference_index++;
               p->value = reference_index;
               reference_index++;
+             hadone = true;
             }
           else if (p->flags & BSF_GLOBAL)
             {
               /* This must be a symbol definition */
  
             }
           else if (p->flags & BSF_GLOBAL)
             {
               /* This must be a symbol definition */
  
-
-             ieee_write_byte (abfd, ieee_external_symbol_enum);
-             ieee_write_int (abfd, public_index);
-             ieee_write_id (abfd, p->name);
-
-             ieee_write_twobyte (abfd, ieee_attribute_record_enum);
-             ieee_write_int (abfd, public_index);
-             ieee_write_byte (abfd, 15);       /* instruction address */
-             ieee_write_byte (abfd, 19);       /* static symbol */
-             ieee_write_byte (abfd, 1);        /* one of them */
-
+             if (! ieee_write_byte (abfd, ieee_external_symbol_enum)
+                 || ! ieee_write_int (abfd, public_index)
+                 || ! ieee_write_id (abfd, p->name)
+                 || ! ieee_write_2bytes (abfd, ieee_attribute_record_enum)
+                 || ! ieee_write_int (abfd, public_index)
+                 || ! ieee_write_byte (abfd, 15) /* instruction address */
+                 || ! ieee_write_byte (abfd, 19) /* static symbol */
+                 || ! ieee_write_byte (abfd, 1)) /* one of them */
+               return false;
  
               /* Write out the value */
  
               /* Write out the value */
-             ieee_write_2bytes (abfd, ieee_value_record_enum);
-             ieee_write_int (abfd, public_index);
+             if (! ieee_write_2bytes (abfd, ieee_value_record_enum)
+                 || ! ieee_write_int (abfd, public_index))
+               return false;
               if (! bfd_is_abs_section (p->section))
                 {
                   if (abfd->flags & EXEC_P)
                     {
                       /* If fully linked, then output all symbols
               if (! bfd_is_abs_section (p->section))
                 {
                   if (abfd->flags & EXEC_P)
                     {
                       /* If fully linked, then output all symbols
-                  relocated */
-                     ieee_write_int (abfd,
-                                     p->value + p->section->output_offset + p->section->output_section->vma);
-
+                        relocated */
+                     if (! (ieee_write_int
+                            (abfd,
+                             (p->value
+                              + p->section->output_offset
+                              + p->section->output_section->vma))))
+                       return false;
                     }
                   else
                     {
                     }
                   else
                     {
-                     ieee_write_expression (abfd,
-                                      p->value + p->section->output_offset,
-                                         p->section->output_section->symbol
-                                            ,false, 0);
+                     if (! (ieee_write_expression
+                            (abfd,
+                             p->value + p->section->output_offset,
+                             p->section->output_section->symbol,
+                             false, 0)))
+                       return false;
                     }
                 }
               else
                 {
                     }
                 }
               else
                 {
-                 ieee_write_expression (abfd,
-                                        p->value,
-                                        bfd_abs_section_ptr->symbol,
-                                        false, 0);
+                 if (! ieee_write_expression (abfd,
+                                              p->value,
+                                              bfd_abs_section_ptr->symbol,
+                                              false, 0))
+                   return false;
                 }
               p->value = public_index;
               public_index++;
                 }
               p->value = public_index;
               public_index++;
+             hadone = true;
             }
           else
             {
             }
           else
             {
@@ -3039,6 +3461,7 @@ ieee_write_external_part (abfd)
    if (hadone)
      ieee->w.r.external_part = here;
  
    if (hadone)
      ieee->w.r.external_part = here;
  
+  return true;
  }
  
  
  }
  
  
@@ -3063,8 +3486,7 @@ static CONST unsigned char envi[] =
  /*    0xf1, 0xce, 0x21, 0, 54, 2,1,1   tool & version # */
  };
  
  /*    0xf1, 0xce, 0x21, 0, 54, 2,1,1   tool & version # */
  };
  
-static
-void
+static boolean
  ieee_write_me_part (abfd)
       bfd *abfd;
  {
  ieee_write_me_part (abfd)
       bfd *abfd;
  {
@@ -3072,18 +3494,101 @@ ieee_write_me_part (abfd)
    ieee->w.r.trailer_part = bfd_tell (abfd);
    if (abfd->start_address)
      {
    ieee->w.r.trailer_part = bfd_tell (abfd);
    if (abfd->start_address)
      {
-      ieee->w.r.me_record = bfd_tell (abfd);
-      ieee_write_2bytes (abfd, ieee_value_starting_address_enum);
-      ieee_write_byte (abfd, ieee_function_either_open_b_enum);
-      ieee_write_int (abfd, abfd->start_address);
-      ieee_write_byte (abfd, ieee_function_either_close_b_enum);
+      if (! ieee_write_2bytes (abfd, ieee_value_starting_address_enum)
+         || ! ieee_write_byte (abfd, ieee_function_either_open_b_enum)
+         || ! ieee_write_int (abfd, abfd->start_address)
+         || ! ieee_write_byte (abfd, ieee_function_either_close_b_enum))
+       return false;
      }
      }
-  else
+  ieee->w.r.me_record = bfd_tell (abfd);
+  if (! ieee_write_byte (abfd, ieee_module_end_enum))
+    return false;
+  return true;
+}
+
+/* Write out the IEEE processor ID.  */
+
+static boolean
+ieee_write_processor (abfd)
+     bfd *abfd;
+{
+  const bfd_arch_info_type *arch;
+
+  arch = bfd_get_arch_info (abfd);
+  switch (arch->arch)
      {
      {
-      ieee->w.r.me_record = bfd_tell (abfd);
+    default:
+      if (! ieee_write_id (abfd, bfd_printable_name (abfd)))
+       return false;
+      break;
+
+    case bfd_arch_a29k:
+      if (! ieee_write_id (abfd, "29000"))
+       return false;
+      break;
+
+    case bfd_arch_h8300:
+      if (! ieee_write_id (abfd, "H8/300"))
+       return false;
+      break;
+
+    case bfd_arch_h8500:
+      if (! ieee_write_id (abfd, "H8/500"))
+       return false;
+      break;
+
+    case bfd_arch_i960:
+      switch (arch->mach)
+       {
+       default:
+       case bfd_mach_i960_core:
+       case bfd_mach_i960_ka_sa:
+         if (! ieee_write_id (abfd, "80960KA"))
+           return false;
+         break;
+
+       case bfd_mach_i960_kb_sb:
+         if (! ieee_write_id (abfd, "80960KB"))
+           return false;
+         break;
+
+       case bfd_mach_i960_ca:
+         if (! ieee_write_id (abfd, "80960CA"))
+           return false;
+         break;
+
+       case bfd_mach_i960_mc:
+       case bfd_mach_i960_xa:
+         if (! ieee_write_id (abfd, "80960MC"))
+           return false;
+         break;
+       }
+      break;
+
+    case bfd_arch_m68k:
+      {
+       const char *id;
+
+       switch (arch->mach)
+         {
+         default:              id = "68020"; break;
+         case bfd_mach_m68000: id = "68000"; break;
+         case bfd_mach_m68008: id = "68008"; break;
+         case bfd_mach_m68010: id = "68010"; break;
+         case bfd_mach_m68020: id = "68020"; break;
+         case bfd_mach_m68030: id = "68030"; break;
+         case bfd_mach_m68040: id = "68040"; break;
+         case bfd_mach_m68060: id = "68060"; break;
+         case bfd_mach_cpu32:  id = "cpu32"; break;
+         }
+
+       if (! ieee_write_id (abfd, id))
+         return false;
+      }
+      break;
      }
      }
-  ieee_write_byte (abfd, ieee_module_end_enum);
  
  
+  return true;
  }
  
  boolean
  }
  
  boolean
@@ -3093,22 +3598,28 @@ ieee_write_object_contents (abfd)
    ieee_data_type *ieee = IEEE_DATA (abfd);
    unsigned int i;
    file_ptr old;
    ieee_data_type *ieee = IEEE_DATA (abfd);
    unsigned int i;
    file_ptr old;
+
    /* Fast forward over the header area */
    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
      return false;
    /* Fast forward over the header area */
    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
      return false;
-  ieee_write_byte (abfd, ieee_module_beginning_enum);
  
  
-  ieee_write_id (abfd, bfd_printable_name (abfd));
-  ieee_write_id (abfd, abfd->filename);
+  if (! ieee_write_byte (abfd, ieee_module_beginning_enum)
+      || ! ieee_write_processor (abfd)
+      || ! ieee_write_id (abfd, abfd->filename))
+    return false;
  
    /* Fast forward over the variable bits */
  
    /* Fast forward over the variable bits */
-  ieee_write_byte (abfd, ieee_address_descriptor_enum);
+  if (! ieee_write_byte (abfd, ieee_address_descriptor_enum))
+    return false;
  
    /* Bits per MAU */
  
    /* Bits per MAU */
-  ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd)));
+  if (! ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd))))
+    return false;
    /* MAU's per address */
    /* MAU's per address */
-  ieee_write_byte (abfd,
-                  (bfd_byte) (bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd)));
+  if (! ieee_write_byte (abfd,
+                        (bfd_byte) (bfd_arch_bits_per_address (abfd)
+                                    / bfd_arch_bits_per_byte (abfd))))
+    return false;
  
    old = bfd_tell (abfd);
    if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
  
    old = bfd_tell (abfd);
    if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
@@ -3118,46 +3629,69 @@ ieee_write_object_contents (abfd)
    if (bfd_write ((char *) exten, 1, sizeof (exten), abfd) != sizeof (exten))
      return false;
    if (abfd->flags & EXEC_P)
    if (bfd_write ((char *) exten, 1, sizeof (exten), abfd) != sizeof (exten))
      return false;
    if (abfd->flags & EXEC_P)
-    ieee_write_byte (abfd, 0x1);/* Absolute */
+    {
+      if (! ieee_write_byte (abfd, 0x1)) /* Absolute */
+       return false;
+    }
    else
    else
-    ieee_write_byte (abfd, 0x2);/* Relocateable */
+    {
+      if (! ieee_write_byte (abfd, 0x2)) /* Relocateable */
+       return false;
+    }
  
    ieee->w.r.environmental_record = bfd_tell (abfd);
    if (bfd_write ((char *) envi, 1, sizeof (envi), abfd) != sizeof (envi))
      return false;
  
    ieee->w.r.environmental_record = bfd_tell (abfd);
    if (bfd_write ((char *) envi, 1, sizeof (envi), abfd) != sizeof (envi))
      return false;
+
+  /* The HP emulator database requires a timestamp in the file.  */
+  {
+    time_t now;
+    const struct tm *t;
+
+    time (&now);
+    t = (struct tm *) localtime (&now);
+    if (! ieee_write_2bytes (abfd, (int) ieee_atn_record_enum)
+       || ! ieee_write_byte (abfd, 0x21)
+       || ! ieee_write_byte (abfd, 0)
+       || ! ieee_write_byte (abfd, 50)
+       || ! ieee_write_int (abfd, t->tm_year + 1900)
+       || ! ieee_write_int (abfd, t->tm_mon + 1)
+       || ! ieee_write_int (abfd, t->tm_mday)
+       || ! ieee_write_int (abfd, t->tm_hour)
+       || ! ieee_write_int (abfd, t->tm_min)
+       || ! ieee_write_int (abfd, t->tm_sec))
+      return false;
+  }
+
    output_bfd = abfd;
    output_bfd = abfd;
-  flush ();
  
  
-  ieee_write_section_part (abfd);
-  /*
-    First write the symbols, this changes their values into table
-    indeces so we cant use it after this point
-    */
-  ieee_write_external_part (abfd);
-  /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
+  flush ();
  
  
+  if (! ieee_write_section_part (abfd))
+    return false;
+  /* First write the symbols.  This changes their values into table
+    indeces so we cant use it after this point.  */
+  if (! ieee_write_external_part (abfd))
+    return false;
  
    /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
  
  
    /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
  
+  /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
  
  
-  /*
-    Write any debugs we have been told about
-    */
-  ieee_write_debug_part (abfd);
-
-  /*
-    Can only write the data once the symbols have been written since
-    the data contains relocation information which points to the
-    symbols
-    */
-  ieee_write_data_part (abfd);
  
  
+  /* Write any debugs we have been told about.  */
+  if (! ieee_write_debug_part (abfd))
+    return false;
  
  
-  /*
-    At the end we put the end !
-    */
-  ieee_write_me_part (abfd);
+  /* Can only write the data once the symbols have been written, since
+     the data contains relocation information which points to the
+     symbols.  */
+  if (! ieee_write_data_part (abfd))
+    return false;
  
  
+  /* At the end we put the end!  */
+  if (! ieee_write_me_part (abfd))
+    return false;
  
    /* Generate the header */
    if (bfd_seek (abfd, old, SEEK_SET) != 0)
  
    /* Generate the header */
    if (bfd_seek (abfd, old, SEEK_SET) != 0)
@@ -3165,33 +3699,29 @@ ieee_write_object_contents (abfd)
  
    for (i = 0; i < N_W_VARIABLES; i++)
      {
  
    for (i = 0; i < N_W_VARIABLES; i++)
      {
-      ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum);
-      ieee_write_byte (abfd, (bfd_byte) i);
-      ieee_write_int5_out (abfd, ieee->w.offset[i]);
+      if (! ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum)
+         || ! ieee_write_byte (abfd, (bfd_byte) i)
+         || ! ieee_write_int5_out (abfd, ieee->w.offset[i]))
+       return false;
      }
      }
+
    return true;
  }
  \f
    return true;
  }
  \f
-
-
  /* Native-level interface to symbols. */
  
  /* We read the symbols into a buffer, which is discarded when this
  /* 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. */
+   function exits.  We read the strings into a buffer large enough to
+   hold them all plus all the cached symbol entries. */
  
  asymbol *
  ieee_make_empty_symbol (abfd)
       bfd *abfd;
  {
  
  asymbol *
  ieee_make_empty_symbol (abfd)
       bfd *abfd;
  {
-
    ieee_symbol_type *new =
    ieee_symbol_type *new =
-  (ieee_symbol_type *) bfd_zmalloc (sizeof (ieee_symbol_type));
+    (ieee_symbol_type *) bfd_zmalloc (sizeof (ieee_symbol_type));
    if (!new)
    if (!new)
-    {
-      bfd_set_error (bfd_error_no_error);
-      return NULL;
-    }
+    return NULL;
    new->symbol.the_bfd = abfd;
    return &new->symbol;
  }
    new->symbol.the_bfd = abfd;
    return &new->symbol;
  }
@@ -3241,13 +3771,13 @@ ieee_find_nearest_line (abfd,
                         filename_ptr,
                         functionname_ptr,
                         line_ptr)
                         filename_ptr,
                         functionname_ptr,
                         line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     char **filename_ptr;
-     char **functionname_ptr;
-     int *line_ptr;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *section ATTRIBUTE_UNUSED;
+     asymbol **symbols ATTRIBUTE_UNUSED;
+     bfd_vma offset ATTRIBUTE_UNUSED;
+     const char **filename_ptr ATTRIBUTE_UNUSED;
+     const char **functionname_ptr ATTRIBUTE_UNUSED;
+     unsigned int *line_ptr ATTRIBUTE_UNUSED;
  {
    return false;
  }
  {
    return false;
  }
@@ -3257,24 +3787,37 @@ ieee_generic_stat_arch_elt (abfd, buf)
       bfd *abfd;
       struct stat *buf;
  {
       bfd *abfd;
       struct stat *buf;
  {
-  ieee_ar_data_type *ar = abfd->my_archive->tdata.ieee_ar_data;
+  ieee_ar_data_type *ar = (ieee_ar_data_type *) NULL;
+  ieee_data_type *ieee;
+
+  if (abfd->my_archive != NULL)
+    ar = abfd->my_archive->tdata.ieee_ar_data;
    if (ar == (ieee_ar_data_type *) NULL)
      {
        bfd_set_error (bfd_error_invalid_operation);
        return -1;
      }
    if (ar == (ieee_ar_data_type *) NULL)
      {
        bfd_set_error (bfd_error_invalid_operation);
        return -1;
      }
-  else
+
+  if (IEEE_DATA (abfd) == NULL)
      {
      {
-      buf->st_size = 0x1;
-      buf->st_mode = 0666;
-      return !ieee_object_p (abfd);
+      if (ieee_object_p (abfd) == NULL)
+       {
+         bfd_set_error (bfd_error_wrong_format);
+         return -1;
+       }
      }
      }
+
+  ieee = IEEE_DATA (abfd);
+
+  buf->st_size = ieee->w.r.me_record + 1;
+  buf->st_mode = 0644;
+  return 0;
  }
  
  static int
  ieee_sizeof_headers (abfd, x)
  }
  
  static int
  ieee_sizeof_headers (abfd, x)
-     bfd *abfd;
-     boolean x;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     boolean x ATTRIBUTE_UNUSED;
  {
    return 0;
  }
  {
    return 0;
  }
@@ -3325,10 +3868,7 @@ ieee_bfd_debug_info_accumulate (abfd, section)
    {
      bfd_chain_type *n = (bfd_chain_type *) bfd_alloc (abfd, sizeof (bfd_chain_type));
      if (!n)
    {
      bfd_chain_type *n = (bfd_chain_type *) bfd_alloc (abfd, sizeof (bfd_chain_type));
      if (!n)
-      {
-       bfd_set_error (bfd_error_no_memory);
-       abort ();               /* FIXME */
-      }
+      abort ();                /* FIXME */
      n->this = section->owner;
      n->next = (bfd_chain_type *) NULL;
  
      n->this = section->owner;
      n->next = (bfd_chain_type *) NULL;
  
@@ -3360,9 +3900,11 @@ ieee_bfd_debug_info_accumulate (abfd, section)
    ((boolean (*) \
      PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
     bfd_true)
    ((boolean (*) \
      PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
     bfd_true)
+#define ieee_read_ar_hdr bfd_nullvoidptr
  #define ieee_update_armap_timestamp bfd_true
  #define ieee_update_armap_timestamp bfd_true
+#define ieee_get_elt_at_index _bfd_generic_get_elt_at_index
  
  
-#define ieee_bfd_is_local_label bfd_generic_is_local_label
+#define ieee_bfd_is_local_label_name bfd_generic_is_local_label_name
  #define ieee_get_lineno _bfd_nosymbols_get_lineno
  #define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
  #define ieee_read_minisymbols _bfd_generic_read_minisymbols
  #define ieee_get_lineno _bfd_nosymbols_get_lineno
  #define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
  #define ieee_read_minisymbols _bfd_generic_read_minisymbols
@@ -3372,9 +3914,12 @@ ieee_bfd_debug_info_accumulate (abfd, section)
  
  #define ieee_set_arch_mach _bfd_generic_set_arch_mach
  
  
  #define ieee_set_arch_mach _bfd_generic_set_arch_mach
  
+#define ieee_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
  #define ieee_bfd_get_relocated_section_contents \
    bfd_generic_get_relocated_section_contents
  #define ieee_bfd_relax_section bfd_generic_relax_section
  #define ieee_bfd_get_relocated_section_contents \
    bfd_generic_get_relocated_section_contents
  #define ieee_bfd_relax_section bfd_generic_relax_section
+#define ieee_bfd_gc_sections bfd_generic_gc_sections
  #define ieee_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
  #define ieee_bfd_link_add_symbols _bfd_generic_link_add_symbols
  #define ieee_bfd_final_link _bfd_generic_final_link
  #define ieee_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
  #define ieee_bfd_link_add_symbols _bfd_generic_link_add_symbols
  #define ieee_bfd_final_link _bfd_generic_final_link
@@ -3385,14 +3930,14 @@ const bfd_target ieee_vec =
  {
    "ieee",                      /* name */
    bfd_target_ieee_flavour,
  {
    "ieee",                      /* name */
    bfd_target_ieee_flavour,
-  true,                                /* target byte order */
-  true,                                /* target headers byte order */
+  BFD_ENDIAN_UNKNOWN,          /* target byte order */
+  BFD_ENDIAN_UNKNOWN,          /* target headers byte order */
    (HAS_RELOC | EXEC_P |                /* object flags */
     HAS_LINENO | HAS_DEBUG |
     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
    (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
     | SEC_ALLOC | SEC_LOAD | SEC_RELOC),        /* section flags */
    (HAS_RELOC | EXEC_P |                /* object flags */
     HAS_LINENO | HAS_DEBUG |
     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
    (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
     | SEC_ALLOC | SEC_LOAD | SEC_RELOC),        /* section flags */
-  0,                           /* leading underscore */
+  '_',                         /* leading underscore */
    ' ',                         /* ar_pad_char */
    16,                          /* ar_max_namelen */
    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
    ' ',                         /* ar_pad_char */
    16,                          /* ar_max_namelen */
    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
@@ -3430,5 +3975,7 @@ const bfd_target ieee_vec =
    BFD_JUMP_TABLE_LINK (ieee),
    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
  
    BFD_JUMP_TABLE_LINK (ieee),
    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
  
+  NULL,
+  
    (PTR) 0
  };
    (PTR) 0
  };