Add a flag to asection, linker_has_input, and use it to reliably

[deliverable/binutils-gdb.git] / bfd / srec.c

diff --git a/bfd/srec.c b/bfd/srec.c
index 34c8ce736992ba751e9d2aad89bff1516e24f524..43ac9a57c758c3a996ffcfbdf6df51e2eb63ad3f 100644 (file)
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -1,5 +1,7 @@
 /* BFD back-end for s-record objects.
 /* BFD back-end for s-record objects.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000
+   Free Software Foundation, Inc.

    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -23,7 +25,7 @@ SUBSECTION
        S-Record handling
 
 DESCRIPTION
        S-Record handling
 
 DESCRIPTION

-       
+

        Ordinary S-Records cannot hold anything but addresses and
        data, so that's all that we implement.
 
        Ordinary S-Records cannot hold anything but addresses and
        data, so that's all that we implement.
 


@@ -41,10 +43,10 @@ DESCRIPTION
        up and output them when it's time to close the bfd.
 
        An s record looks like:
        up and output them when it's time to close the bfd.
 
        An s record looks like:

-       
+

 EXAMPLE
        S<type><length><address><data><checksum>
 EXAMPLE
        S<type><length><address><data><checksum>

-       
+

 DESCRIPTION
        Where
        o length
 DESCRIPTION
        Where
        o length


@@ -60,7 +62,7 @@ DESCRIPTION
        7) four byte address termination record
        8) three byte address termination record
        9) two byte address termination record
        7) four byte address termination record
        8) three byte address termination record
        9) two byte address termination record

-       
+

        o address
        is the start address of the data following, or in the case of
        a termination record, the start address of the image
        o address
        is the start address of the data following, or in the case of
        a termination record, the start address of the image


@@ -70,7 +72,6 @@ DESCRIPTION
        is the sum of all the raw byte data in the record, from the length
        upwards, modulo 256 and subtracted from 255.
 
        is the sum of all the raw byte data in the record, from the length
        upwards, modulo 256 and subtracted from 255.
 

-

 SUBSECTION
        Symbol S-Record handling
 
 SUBSECTION
        Symbol S-Record handling
 


@@ -100,14 +101,18 @@ EXAMPLE
 DESCRIPTION
        We allow symbols to be anywhere in the data stream - the module names
        are always ignored.
 DESCRIPTION
        We allow symbols to be anywhere in the data stream - the module names
        are always ignored.

-               
+

 */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 #include "libiberty.h"
 */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 #include "libiberty.h"

+#include <ctype.h>

 
 

+static void srec_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
+static void srec_print_symbol
+ PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));

 static void srec_init PARAMS ((void));
 static boolean srec_mkobject PARAMS ((bfd *));
 static int srec_get_byte PARAMS ((bfd *, boolean *));
 static void srec_init PARAMS ((void));
 static boolean srec_mkobject PARAMS ((bfd *));
 static int srec_get_byte PARAMS ((bfd *, boolean *));


@@ -122,8 +127,22 @@ static boolean srec_write_record PARAMS ((bfd *, int, bfd_vma,
                                          const bfd_byte *));
 static boolean srec_write_header PARAMS ((bfd *));
 static boolean srec_write_symbols PARAMS ((bfd *));
                                          const bfd_byte *));
 static boolean srec_write_header PARAMS ((bfd *));
 static boolean srec_write_symbols PARAMS ((bfd *));

-
-/* Macros for converting between hex and binary. */
+static boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
+static boolean srec_get_section_contents
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+static boolean srec_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static boolean srec_set_section_contents
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+static boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
+static boolean srec_write_object_contents PARAMS ((bfd *));
+static boolean symbolsrec_write_object_contents PARAMS ((bfd *));
+static int srec_sizeof_headers PARAMS ((bfd *, boolean));
+static asymbol *srec_make_empty_symbol PARAMS ((bfd *));
+static long srec_get_symtab_upper_bound PARAMS ((bfd *));
+static long srec_get_symtab PARAMS ((bfd *, asymbol **));
+
+/* Macros for converting between hex and binary.  */

 
 static CONST char digs[] = "0123456789ABCDEF";
 
 
 static CONST char digs[] = "0123456789ABCDEF";
 


@@ -135,7 +154,7 @@ static CONST char digs[] = "0123456789ABCDEF";
        ch += ((x) & 0xff);
 #define        ISHEX(x)  hex_p(x)
 
        ch += ((x) & 0xff);
 #define        ISHEX(x)  hex_p(x)
 

-/* Initialize by filling in the hex conversion array. */
+/* Initialize by filling in the hex conversion array.  */

 
 static void
 srec_init ()
 
 static void
 srec_init ()


@@ -149,10 +168,21 @@ srec_init ()
     }
 }
 
     }
 }
 

-/* The maximum number of bytes on a line is FF */
+/* The maximum number of bytes on a line is FF.  */

 #define MAXCHUNK 0xff
 #define MAXCHUNK 0xff

-/* The number of bytes we fit onto a line on output */
-#define CHUNK 21
+
+/* Default size for a CHUNK.  */
+#define DEFAULT_CHUNK 16
+
+/* The number of bytes we actually fit onto a line on output.
+   This variable can be modified by objcopy's --srec-len parameter.
+   For a 0x75 byte record you should set --srec-len=0x70.  */
+unsigned int Chunk = DEFAULT_CHUNK;
+
+/* The type of srec output (free or forced to S3).
+   This variable can be modified by objcopy's --srec-forceS3
+   parameter.  */
+boolean S3Forced = 0;

 
 /* When writing an S-record file, the S-records can not be output as
    they are seen.  This structure is used to hold them in memory.  */
 
 /* When writing an S-record file, the S-records can not be output as
    they are seen.  This structure is used to hold them in memory.  */


@@ -207,10 +237,7 @@ srec_mkobject (abfd)
     {
       tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
       if (tdata == NULL)
     {
       tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
       if (tdata == NULL)

-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
+       return false;

       abfd->tdata.srec_data = tdata;
       tdata->type = 1;
       tdata->head = NULL;
       abfd->tdata.srec_data = tdata;
       tdata->type = 1;
       tdata->head = NULL;


@@ -270,8 +297,9 @@ srec_bad_byte (abfd, lineno, c, error)
          buf[0] = c;
          buf[1] = '\0';
        }
          buf[0] = c;
          buf[1] = '\0';
        }

-      fprintf (stderr, "%s:%d: Unexpected character `%s' in S-record file\n",
-              bfd_get_filename (abfd), lineno, buf);
+      (*_bfd_error_handler)
+       (_("%s:%d: Unexpected character `%s' in S-record file\n"),
+        bfd_get_filename (abfd), lineno, buf);

       bfd_set_error (bfd_error_bad_value);
     }
 }
       bfd_set_error (bfd_error_bad_value);
     }
 }


@@ -288,10 +316,7 @@ srec_new_symbol (abfd, name, val)
 
   n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (struct srec_symbol));
   if (n == NULL)
 
   n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (struct srec_symbol));
   if (n == NULL)

-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;

 
   n->name = name;
   n->val = val;
 
   n->name = name;
   n->val = val;


@@ -321,6 +346,7 @@ srec_scan (abfd)
   bfd_byte *buf = NULL;
   size_t bufsize = 0;
   asection *sec = NULL;
   bfd_byte *buf = NULL;
   size_t bufsize = 0;
   asection *sec = NULL;

+  char *symbuf = NULL;

 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     goto error_return;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     goto error_return;


@@ -361,80 +387,110 @@ srec_scan (abfd)
          break;
 
        case ' ':
          break;
 
        case ' ':

-         {
-           char *symname;
-           bfd_vma symval;
-
-           /* Starting a symbol definition.  */
-           while ((c = srec_get_byte (abfd, &error)) != EOF
-                  && (c == ' ' || c == '\t'))
-             ;
-           if (c == EOF)
-             {
-               srec_bad_byte (abfd, lineno, c, error);
-               goto error_return;
-             }
+         do
+           {
+             unsigned int alc;
+             char *p, *symname;
+             bfd_vma symval;

 
 

-           obstack_1grow (&abfd->memory, c);
-           while ((c = srec_get_byte (abfd, &error)) != EOF
-                  && ! isspace (c))
-             obstack_1grow (&abfd->memory, c);
-           if (c == EOF)
-             {
-               srec_bad_byte (abfd, lineno, c, error);
-               goto error_return;
-             }
+             /* Starting a symbol definition.  */
+             while ((c = srec_get_byte (abfd, &error)) != EOF
+                    && (c == ' ' || c == '\t'))
+               ;

 
 

-           symname = obstack_finish (&abfd->memory);
-           if (symname == NULL)
-             {
-               bfd_set_error (bfd_error_no_memory);
-               goto error_return;
-             }
-      
-           while ((c = srec_get_byte (abfd, &error)) != EOF
-                  && (c == ' ' || c == '\t'))
-             ;
-           if (c == EOF)
-             {
-               srec_bad_byte (abfd, lineno, c, error);
-               goto error_return;
-             }
+             if (c == '\n' || c == '\r')
+               break;

 
 

-           /* Skip a dollar sign before the hex value.  */
-           if (c == '$')
-             {
-               c = srec_get_byte (abfd, &error);
-               if (c == EOF)
-                 {
-                   srec_bad_byte (abfd, lineno, c, error);
-                   goto error_return;
-                 }
-             }
+             if (c == EOF)
+               {
+                 srec_bad_byte (abfd, lineno, c, error);
+                 goto error_return;
+               }

 
 

-           symval = 0;
-           while (ISHEX (c))
-             {
-               symval <<= 4;
-               symval += NIBBLE (c);
-               c = srec_get_byte (abfd, &error);
-             }
+             alc = 10;
+             symbuf = (char *) bfd_malloc (alc + 1);
+             if (symbuf == NULL)
+               goto error_return;

 
 

-           if (c == EOF || ! isspace (c))
-             {
-               srec_bad_byte (abfd, lineno, c, error);
+             p = symbuf;
+
+             *p++ = c;
+             while ((c = srec_get_byte (abfd, &error)) != EOF
+                    && ! isspace (c))
+               {
+                 if ((unsigned int) (p - symbuf) >= alc)
+                   {
+                     char *n;
+
+                     alc *= 2;
+                     n = (char *) bfd_realloc (symbuf, alc + 1);
+                     if (n == NULL)
+                       goto error_return;
+                     p = n + (p - symbuf);
+                     symbuf = n;
+                   }
+
+                 *p++ = c;
+               }
+
+             if (c == EOF)
+               {
+                 srec_bad_byte (abfd, lineno, c, error);
+                 goto error_return;
+               }
+
+             *p++ = '\0';
+             symname = bfd_alloc (abfd, p - symbuf);
+             if (symname == NULL)

                goto error_return;
                goto error_return;

-             }
+             strcpy (symname, symbuf);
+             free (symbuf);
+             symbuf = NULL;
+
+             while ((c = srec_get_byte (abfd, &error)) != EOF
+                    && (c == ' ' || c == '\t'))
+               ;
+             if (c == EOF)
+               {
+                 srec_bad_byte (abfd, lineno, c, error);
+                 goto error_return;
+               }
+
+             /* Skip a dollar sign before the hex value.  */
+             if (c == '$')
+               {
+                 c = srec_get_byte (abfd, &error);
+                 if (c == EOF)
+                   {
+                     srec_bad_byte (abfd, lineno, c, error);
+                     goto error_return;
+                   }
+               }
+
+             symval = 0;
+             while (ISHEX (c))
+               {
+                 symval <<= 4;
+                 symval += NIBBLE (c);
+                 c = srec_get_byte (abfd, &error);
+               }
+
+             if (! srec_new_symbol (abfd, symname, symval))
+               goto error_return;
+           }
+         while (c == ' ' || c == '\t')
+           ;

 
 

-           if (! srec_new_symbol (abfd, symname, symval))
+         if (c == '\n')
+           ++lineno;
+         else if (c != '\r')
+           {
+             srec_bad_byte (abfd, lineno, c, error);

              goto error_return;
              goto error_return;

+           }

 
 

-           if (c == '\n')
-             ++lineno;
-
-         }

          break;
          break;

-    
+

        case 'S':
          {
            file_ptr pos;
        case 'S':
          {
            file_ptr pos;


@@ -465,12 +521,9 @@ srec_scan (abfd)
              {
                if (buf != NULL)
                  free (buf);
              {
                if (buf != NULL)
                  free (buf);

-               buf = (bfd_byte *) malloc (bytes * 2);
+               buf = (bfd_byte *) bfd_malloc (bytes * 2);

                if (buf == NULL)
                if (buf == NULL)

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

                bufsize = bytes * 2;
              }
 
                bufsize = bytes * 2;
              }
 


@@ -528,6 +581,7 @@ srec_scan (abfd)
                      goto error_return;
                    sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
                    sec->vma = address;
                      goto error_return;
                    sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
                    sec->vma = address;

+                   sec->lma = address;

                    sec->_raw_size = bytes;
                    sec->filepos = pos;
                  }
                    sec->_raw_size = bytes;
                    sec->filepos = pos;
                  }


@@ -570,6 +624,8 @@ srec_scan (abfd)
   return true;
 
  error_return:
   return true;
 
  error_return:

+  if (symbuf != NULL)
+    free (symbuf);

   if (buf != NULL)
     free (buf);
   return false;
   if (buf != NULL)
     free (buf);
   return false;


@@ -599,6 +655,9 @@ srec_object_p (abfd)
       || ! srec_scan (abfd))
     return NULL;
 
       || ! srec_scan (abfd))
     return NULL;
 

+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+

   return abfd->xvec;
 }
 
   return abfd->xvec;
 }
 


@@ -626,6 +685,9 @@ symbolsrec_object_p (abfd)
       || ! srec_scan (abfd))
     return NULL;
 
       || ! srec_scan (abfd))
     return NULL;
 

+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+

   return abfd->xvec;
 }
 
   return abfd->xvec;
 }
 


@@ -671,12 +733,9 @@ srec_read_section (abfd, section, contents)
        {
          if (buf != NULL)
            free (buf);
        {
          if (buf != NULL)
            free (buf);

-         buf = (bfd_byte *) malloc (bytes * 2);
+         buf = (bfd_byte *) bfd_malloc (bytes * 2);

          if (buf == NULL)
          if (buf == NULL)

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

          bufsize = bytes * 2;
        }
 
          bufsize = bytes * 2;
        }
 


@@ -764,21 +823,35 @@ srec_get_section_contents (abfd, section, location, offset, count)
       section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
       if (section->used_by_bfd == NULL
          && section->_raw_size != 0)
       section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
       if (section->used_by_bfd == NULL
          && section->_raw_size != 0)

-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
+       return false;

 
       if (! srec_read_section (abfd, section, section->used_by_bfd))
        return false;
     }
 
 
       if (! srec_read_section (abfd, section, section->used_by_bfd))
        return false;
     }
 

-  memcpy (location, (bfd_byte *) section->used_by_bfd + offset, count);
+  memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
+         (size_t) count);

 
   return true;
 }
 
 
   return true;
 }
 

-/* we have to save up all the Srecords for a splurge before output */
+/* Set the architecture.  We accept an unknown architecture here.  */
+
+static boolean
+srec_set_arch_mach (abfd, arch, mach)
+     bfd *abfd;
+     enum bfd_architecture arch;
+     unsigned long mach;
+{
+  if (arch == bfd_arch_unknown)
+    {
+      abfd->arch_info = &bfd_default_arch_struct;
+      return true;
+    }
+  return bfd_default_set_arch_mach (abfd, arch, mach);
+}
+
+/* We have to save up all the Srecords for a splurge before output.  */

 
 static boolean
 srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
 
 static boolean
 srec_set_section_contents (abfd, section, location, offset, bytes_to_do)


@@ -794,10 +867,7 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
   entry = ((srec_data_list_type *)
           bfd_alloc (abfd, sizeof (srec_data_list_type)));
   if (entry == NULL)
   entry = ((srec_data_list_type *)
           bfd_alloc (abfd, sizeof (srec_data_list_type)));
   if (entry == NULL)

-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;

 
   if (bytes_to_do
       && (section->flags & SEC_ALLOC)
 
   if (bytes_to_do
       && (section->flags & SEC_ALLOC)


@@ -805,25 +875,20 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
     {
       bfd_byte *data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
       if (data == NULL)
     {
       bfd_byte *data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
       if (data == NULL)

-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
-      memcpy ((PTR) data, location, bytes_to_do);
-
-      if ((section->lma + offset + bytes_to_do - 1) <= 0xffff)
-       {
-
-       }
+       return false;
+      memcpy ((PTR) data, location, (size_t) bytes_to_do);
+
+      /* Ff S3Forced is true then always select S3 records,
+        regardless of the siez of the addresses.  */
+      if (S3Forced)
+       tdata->type = 3;
+      else if ((section->lma + offset + bytes_to_do - 1) <= 0xffff)
+       ;  /* The default, S1, is OK.  */

       else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff
       else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff

-              && tdata->type < 2)
-       {
-         tdata->type = 2;
-       }
+              && tdata->type <= 2)
+       tdata->type = 2;

       else
       else

-       {
-         tdata->type = 3;
-       }
+       tdata->type = 3;

 
       entry->data = data;
       entry->where = section->lma + offset;
 
       entry->data = data;
       entry->where = section->lma + offset;


@@ -857,8 +922,8 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
 
 /* Write a record of type, of the supplied number of bytes. The
    supplied bytes and length don't have a checksum. That's worked out
 
 /* Write a record of type, of the supplied number of bytes. The
    supplied bytes and length don't have a checksum. That's worked out

-   here
-*/
+   here.  */
+

 static boolean
 srec_write_record (abfd, type, address, data, end)
      bfd *abfd;
 static boolean
 srec_write_record (abfd, type, address, data, end)
      bfd *abfd;


@@ -872,12 +937,13 @@ srec_write_record (abfd, type, address, data, end)
   CONST bfd_byte *src = data;
   char *dst = buffer;
   char *length;
   CONST bfd_byte *src = data;
   char *dst = buffer;
   char *length;

+  bfd_size_type wrlen;

 
   *dst++ = 'S';
   *dst++ = '0' + type;
 
   length = dst;
 
   *dst++ = 'S';
   *dst++ = '0' + type;
 
   length = dst;

-  dst += 2;                    /* leave room for dst*/
+  dst += 2;                    /* Leave room for dst.  */

 
   switch (type)
     {
 
   switch (type)
     {


@@ -905,7 +971,7 @@ srec_write_record (abfd, type, address, data, end)
       dst += 2;
     }
 
       dst += 2;
     }
 

-  /* Fill in the length */
+  /* Fill in the length.  */

   TOHEX (length, (dst - length) / 2, check_sum);
   check_sum &= 0xff;
   check_sum = 255 - check_sum;
   TOHEX (length, (dst - length) / 2, check_sum);
   check_sum &= 0xff;
   check_sum = 255 - check_sum;


@@ -914,13 +980,12 @@ srec_write_record (abfd, type, address, data, end)
 
   *dst++ = '\r';
   *dst++ = '\n';
 
   *dst++ = '\r';
   *dst++ = '\n';

-  if (bfd_write ((PTR) buffer, 1, dst - buffer, abfd) != dst - buffer)
+  wrlen = dst - buffer;
+  if (bfd_write ((PTR) buffer, 1, wrlen, abfd) != wrlen)

     return false;
   return true;
 }
 
     return false;
   return true;
 }
 

-
-

 static boolean
 srec_write_header (abfd)
      bfd *abfd;
 static boolean
 srec_write_header (abfd)
      bfd *abfd;


@@ -929,11 +994,10 @@ srec_write_header (abfd)
   bfd_byte *dst = buffer;
   unsigned int i;
 
   bfd_byte *dst = buffer;
   unsigned int i;
 

-  /* I'll put an arbitary 40 char limit on header size */
+  /* I'll put an arbitary 40 char limit on header size.  */

   for (i = 0; i < 40 && abfd->filename[i]; i++)
   for (i = 0; i < 40 && abfd->filename[i]; i++)

-    {
-      *dst++ = abfd->filename[i];
-    }
+    *dst++ = abfd->filename[i];
+

   return srec_write_record (abfd, 0, 0, buffer, dst);
 }
 
   return srec_write_record (abfd, 0, 0, buffer, dst);
 }
 


@@ -943,31 +1007,28 @@ srec_write_section (abfd, tdata, list)
      tdata_type *tdata;
      srec_data_list_type *list;
 {
      tdata_type *tdata;
      srec_data_list_type *list;
 {

-  unsigned int bytes_written = 0;
+  unsigned int octets_written = 0;

   bfd_byte *location = list->data;
 
   bfd_byte *location = list->data;
 

-  while (bytes_written < list->size)
+  while (octets_written < list->size)

     {
       bfd_vma address;
     {
       bfd_vma address;

+      unsigned int octets_this_chunk = list->size - octets_written;

 
 

-      unsigned int bytes_this_chunk = list->size - bytes_written;
-
-      if (bytes_this_chunk > CHUNK)
-       {
-         bytes_this_chunk = CHUNK;
-       }
+      if (octets_this_chunk > Chunk)
+       octets_this_chunk = Chunk;

 
 

-      address = list->where + bytes_written;
+      address = list->where + octets_written / bfd_octets_per_byte (abfd);

 
       if (! srec_write_record (abfd,
                               tdata->type,
                               address,
                               location,
 
       if (! srec_write_record (abfd,
                               tdata->type,
                               address,
                               location,

-                              location + bytes_this_chunk))
+                              location + octets_this_chunk))

        return false;
 
        return false;
 

-      bytes_written += bytes_this_chunk;
-      location += bytes_this_chunk;
+      octets_written += octets_this_chunk;
+      location += octets_this_chunk;

     }
 
   return true;
     }
 
   return true;


@@ -984,14 +1045,12 @@ srec_write_terminator (abfd, tdata)
                            abfd->start_address, buffer, buffer);
 }
 
                            abfd->start_address, buffer, buffer);
 }
 

-
-

 static boolean
 srec_write_symbols (abfd)
      bfd *abfd;
 {
   char buffer[MAXCHUNK];
 static boolean
 srec_write_symbols (abfd)
      bfd *abfd;
 {
   char buffer[MAXCHUNK];

-  /* Dump out the symbols of a bfd */
+  /* Dump out the symbols of a bfd.  */

   int i;
   int count = bfd_get_symcount (abfd);
 
   int i;
   int count = bfd_get_symcount (abfd);
 


@@ -1008,30 +1067,11 @@ srec_write_symbols (abfd)
       for (i = 0; i < count; i++)
        {
          asymbol *s = table[i];
       for (i = 0; i < count; i++)
        {
          asymbol *s = table[i];

-#if 0
-         int len = strlen (s->name);
-
-         /* If this symbol has a .[ocs] in it, it's probably a file name
-        and we'll output that as the module name */
-
-         if (len > 3 && s->name[len - 2] == '.')
+         if (! bfd_is_local_label (abfd, s)
+             && (s->flags & BSF_DEBUGGING) == 0)

            {
            {

-             int l;
-             sprintf (buffer, "$$ %s\r\n", s->name);
-             l = strlen (buffer);
-             if (bfd_write (buffer, l, 1, abfd) != l)
-               return false;
-           }
-         else
-#endif
-           if (s->flags & (BSF_GLOBAL | BSF_LOCAL)
-               && (s->flags & BSF_DEBUGGING) == 0
-               && s->name[0] != '.'
-               && s->name[0] != 't')
-           {
-             /* Just dump out non debug symbols */
-
-             int l;
+             /* Just dump out non debug symbols.  */
+             bfd_size_type l;

              char buf2[40], *p;
 
              sprintf_vma (buf2,
              char buf2[40], *p;
 
              sprintf_vma (buf2,


@@ -1072,7 +1112,7 @@ internal_srec_write_object_contents (abfd, symbols)
   if (! srec_write_header (abfd))
     return false;
 
   if (! srec_write_header (abfd))
     return false;
 

-  /* Now wander though all the sections provided and output them */
+  /* Now wander though all the sections provided and output them.  */

   list = tdata->head;
 
   while (list != (srec_data_list_type *) NULL)
   list = tdata->head;
 
   while (list != (srec_data_list_type *) NULL)


@@ -1098,11 +1138,10 @@ symbolsrec_write_object_contents (abfd)
   return internal_srec_write_object_contents (abfd, 1);
 }
 
   return internal_srec_write_object_contents (abfd, 1);
 }
 

-/*ARGSUSED*/

 static int
 srec_sizeof_headers (abfd, exec)
 static int
 srec_sizeof_headers (abfd, exec)

-     bfd *abfd;
-     boolean exec;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     boolean exec ATTRIBUTE_UNUSED;

 {
   return 0;
 }
 {
   return 0;
 }


@@ -1145,10 +1184,7 @@ srec_get_symtab (abfd, alocation)
 
       csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
       if (csymbols == NULL && symcount != 0)
 
       csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
       if (csymbols == NULL && symcount != 0)

-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
+       return false;

       abfd->tdata.srec_data->csymbols = csymbols;
 
       for (s = abfd->tdata.srec_data->symbols, c = csymbols;
       abfd->tdata.srec_data->csymbols = csymbols;
 
       for (s = abfd->tdata.srec_data->symbols, c = csymbols;


@@ -1163,7 +1199,7 @@ srec_get_symtab (abfd, alocation)
          c->udata.p = NULL;
        }
     }
          c->udata.p = NULL;
        }
     }

-       
+

   for (i = 0; i < symcount; i++)
     *alocation++ = csymbols++;
   *alocation = NULL;
   for (i = 0; i < symcount; i++)
     *alocation++ = csymbols++;
   *alocation = NULL;


@@ -1171,20 +1207,18 @@ srec_get_symtab (abfd, alocation)
   return symcount;
 }
 
   return symcount;
 }
 

-/*ARGSUSED*/
-void
+static void

 srec_get_symbol_info (ignore_abfd, symbol, ret)
 srec_get_symbol_info (ignore_abfd, symbol, ret)

-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;

      asymbol *symbol;
      symbol_info *ret;
 {
   bfd_symbol_info (symbol, ret);
 }
 
      asymbol *symbol;
      symbol_info *ret;
 {
   bfd_symbol_info (symbol, ret);
 }
 

-/*ARGSUSED*/
-void
+static void

 srec_print_symbol (ignore_abfd, afile, symbol, how)
 srec_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;


@@ -1208,7 +1242,7 @@ srec_print_symbol (ignore_abfd, afile, symbol, how)
 #define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
 #define srec_new_section_hook _bfd_generic_new_section_hook
 
 #define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
 #define srec_new_section_hook _bfd_generic_new_section_hook
 

-#define srec_bfd_is_local_label bfd_generic_is_local_label
+#define srec_bfd_is_local_label_name bfd_generic_is_local_label_name

 #define srec_get_lineno _bfd_nosymbols_get_lineno
 #define srec_find_nearest_line _bfd_nosymbols_find_nearest_line
 #define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
 #define srec_get_lineno _bfd_nosymbols_get_lineno
 #define srec_find_nearest_line _bfd_nosymbols_find_nearest_line
 #define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol


@@ -1221,11 +1255,14 @@ srec_print_symbol (ignore_abfd, afile, symbol, how)
   ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
 #define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
 
   ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
 #define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
 

-#define srec_set_arch_mach bfd_default_set_arch_mach
+#define srec_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window

 
 #define srec_bfd_get_relocated_section_contents \
   bfd_generic_get_relocated_section_contents
 #define srec_bfd_relax_section bfd_generic_relax_section
 
 #define srec_bfd_get_relocated_section_contents \
   bfd_generic_get_relocated_section_contents
 #define srec_bfd_relax_section bfd_generic_relax_section

+#define srec_bfd_gc_sections bfd_generic_gc_sections
+#define srec_bfd_merge_sections bfd_generic_merge_sections

 #define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols
 #define srec_bfd_final_link _bfd_generic_final_link
 #define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols
 #define srec_bfd_final_link _bfd_generic_final_link


@@ -1235,8 +1272,8 @@ const bfd_target srec_vec =
 {
   "srec",                      /* name */
   bfd_target_srec_flavour,
 {
   "srec",                      /* name */
   bfd_target_srec_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),
   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),


@@ -1245,7 +1282,6 @@ const bfd_target srec_vec =
   0,                           /* leading underscore */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   0,                           /* leading underscore */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

-  1,                           /* minimum alignment */

   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */


@@ -1282,17 +1318,17 @@ const bfd_target srec_vec =
   BFD_JUMP_TABLE_LINK (srec),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   BFD_JUMP_TABLE_LINK (srec),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 

+  NULL,
+

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

-
-

 const bfd_target symbolsrec_vec =
 {
   "symbolsrec",                        /* name */
   bfd_target_srec_flavour,
 const bfd_target symbolsrec_vec =
 {
   "symbolsrec",                        /* name */
   bfd_target_srec_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),
   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),


@@ -1301,7 +1337,6 @@ const bfd_target symbolsrec_vec =
   0,                           /* leading underscore */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   0,                           /* leading underscore */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

-  1,                           /* minimum alignment */

   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* data */


@@ -1338,5 +1373,7 @@ const bfd_target symbolsrec_vec =
   BFD_JUMP_TABLE_LINK (srec),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   BFD_JUMP_TABLE_LINK (srec),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 

+  NULL,
+

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