* elf32-vax.c (elf_vax_relocate_section)

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

diff --git a/bfd/ihex.c b/bfd/ihex.c
index 9f765b33f770910374e1e5a0d99562a379c6436b..09f756a1c2c11e57c5da15a6ff96491275575b86 100644 (file)
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -1,13 +1,13 @@
 /* BFD back-end for Intel Hex objects.
    Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 /* BFD back-end for Intel Hex objects.
    Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2009, 2011 Free Software Foundation, Inc.

    Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


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

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* This is what Intel Hex files look like:
 
 
 /* This is what Intel Hex files look like:
 


@@ -175,7 +177,7 @@ ihex_mkobject (bfd *abfd)
 {
   struct ihex_data_struct *tdata;
 
 {
   struct ihex_data_struct *tdata;
 

-  tdata = bfd_alloc (abfd, sizeof (* tdata));
+  tdata = (struct ihex_data_struct *) bfd_alloc (abfd, sizeof (* tdata));

   if (tdata == NULL)
     return FALSE;
 
   if (tdata == NULL)
     return FALSE;
 


@@ -307,7 +309,7 @@ ihex_scan (bfd *abfd)
          chars = len * 2 + 2;
          if (chars >= bufsize)
            {
          chars = len * 2 + 2;
          if (chars >= bufsize)
            {

-             buf = bfd_realloc (buf, (bfd_size_type) chars);
+             buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) chars);

              if (buf == NULL)
                goto error_return;
              bufsize = chars;
              if (buf == NULL)
                goto error_return;
              bufsize = chars;


@@ -359,7 +361,7 @@ ihex_scan (bfd *abfd)
 
                  sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
                  amt = strlen (secbuf) + 1;
 
                  sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
                  amt = strlen (secbuf) + 1;

-                 secname = bfd_alloc (abfd, amt);
+                 secname = (char *) bfd_alloc (abfd, amt);

                  if (secname == NULL)
                    goto error_return;
                  strcpy (secname, secbuf);
                  if (secname == NULL)
                    goto error_return;
                  strcpy (secname, secbuf);


@@ -581,7 +583,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
 
       if (len * 2 > bufsize)
        {
 
       if (len * 2 > bufsize)
        {

-         buf = bfd_realloc (buf, (bfd_size_type) len * 2);
+         buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) len * 2);

          if (buf == NULL)
            goto error_return;
          bufsize = len * 2;
          if (buf == NULL)
            goto error_return;
          bufsize = len * 2;


@@ -638,7 +640,8 @@ ihex_get_section_contents (bfd *abfd,
       section->used_by_bfd = bfd_alloc (abfd, section->size);
       if (section->used_by_bfd == NULL)
        return FALSE;
       section->used_by_bfd = bfd_alloc (abfd, section->size);
       if (section->used_by_bfd == NULL)
        return FALSE;

-      if (! ihex_read_section (abfd, section, section->used_by_bfd))
+      if (! ihex_read_section (abfd, section,
+                               (bfd_byte *) section->used_by_bfd))

        return FALSE;
     }
 
        return FALSE;
     }
 


@@ -666,11 +669,11 @@ ihex_set_section_contents (bfd *abfd,
       || (section->flags & SEC_LOAD) == 0)
     return TRUE;
 
       || (section->flags & SEC_LOAD) == 0)
     return TRUE;
 

-  n = bfd_alloc (abfd, sizeof (* n));
+  n = (struct ihex_data_list *) bfd_alloc (abfd, sizeof (* n));

   if (n == NULL)
     return FALSE;
 
   if (n == NULL)
     return FALSE;
 

-  data = bfd_alloc (abfd, count);
+  data = (bfd_byte *) bfd_alloc (abfd, count);

   if (data == NULL)
     return FALSE;
   memcpy (data, location, (size_t) count);
   if (data == NULL)
     return FALSE;
   memcpy (data, location, (size_t) count);


@@ -927,14 +930,18 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define ihex_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
 #define ihex_bfd_relax_section                    bfd_generic_relax_section
 #define ihex_bfd_gc_sections                      bfd_generic_gc_sections
 #define ihex_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
 #define ihex_bfd_relax_section                    bfd_generic_relax_section
 #define ihex_bfd_gc_sections                      bfd_generic_gc_sections

+#define ihex_bfd_lookup_section_flags             bfd_generic_lookup_section_flags

 #define ihex_bfd_merge_sections                   bfd_generic_merge_sections
 #define ihex_bfd_is_group_section                 bfd_generic_is_group_section
 #define ihex_bfd_discard_group                    bfd_generic_discard_group
 #define ihex_section_already_linked               _bfd_generic_section_already_linked
 #define ihex_bfd_merge_sections                   bfd_generic_merge_sections
 #define ihex_bfd_is_group_section                 bfd_generic_is_group_section
 #define ihex_bfd_discard_group                    bfd_generic_discard_group
 #define ihex_section_already_linked               _bfd_generic_section_already_linked

+#define ihex_bfd_define_common_symbol             bfd_generic_define_common_symbol

 #define ihex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
 #define ihex_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
 #define ihex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
 #define ihex_bfd_link_just_syms                   _bfd_generic_link_just_syms
 #define ihex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
 #define ihex_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
 #define ihex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
 #define ihex_bfd_link_just_syms                   _bfd_generic_link_just_syms

+#define ihex_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type

 #define ihex_bfd_final_link                       _bfd_generic_final_link
 #define ihex_bfd_link_split_section               _bfd_generic_link_split_section
 
 #define ihex_bfd_final_link                       _bfd_generic_final_link
 #define ihex_bfd_link_split_section               _bfd_generic_link_split_section
 


@@ -951,6 +958,7 @@ const bfd_target ihex_vec =
   0,                           /* Leading underscore.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */
   0,                           /* Leading underscore.  */
   ' ',                         /* AR_pad_char.  */
   16,                          /* AR_max_namelen.  */

+  0,                           /* match priority.  */

   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.  */