Automatic date update in version.in

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

diff --git a/bfd/binary.c b/bfd/binary.c
index 89fc55f3262e133f2387d59782d77f5213cb17bc..999de0d8c41a4e7d8e5072de86983c1717ab900d 100644 (file)
--- a/bfd/binary.c
+++ b/bfd/binary.c
@@ -1,13 +1,12 @@
 /* BFD back-end for binary objects.
 /* BFD back-end for binary objects.

-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994-2020 Free Software Foundation, Inc.

    Written by Ian Lance Taylor, 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, 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 +16,8 @@
 
    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 a BFD backend which may be used to write binary objects.
    It may only be used for output, not input.  The intention is that
 
 /* This is a BFD backend which may be used to write binary objects.
    It may only be used for output, not input.  The intention is that


@@ -32,8 +32,8 @@
    the file.  objcopy cooperates by specially setting the start
    address to zero by default.  */
 
    the file.  objcopy cooperates by specially setting the start
    address to zero by default.  */
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "safe-ctype.h"
 #include "libbfd.h"
 
 #include "safe-ctype.h"
 #include "libbfd.h"
 


@@ -41,11 +41,6 @@
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define BIN_SYMS 3
 
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define BIN_SYMS 3
 

-/* Set by external programs - specifies the BFD architecture and
-   machine number to be uses when creating binary BFDs.  */
-enum bfd_architecture  bfd_external_binary_architecture = bfd_arch_unknown;
-unsigned long          bfd_external_machine = 0;
-

 /* Create a binary object.  Invoked via bfd_set_format.  */
 
 static bfd_boolean
 /* Create a binary object.  Invoked via bfd_set_format.  */
 
 static bfd_boolean


@@ -58,7 +53,7 @@ binary_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
    was not defaulted.  That is, it must be explicitly specified as
    being binary.  */
 
    was not defaulted.  That is, it must be explicitly specified as
    being binary.  */
 

-static const bfd_target *
+static bfd_cleanup

 binary_object_p (bfd *abfd)
 {
   struct stat statbuf;
 binary_object_p (bfd *abfd)
 {
   struct stat statbuf;


@@ -91,15 +86,7 @@ binary_object_p (bfd *abfd)
 
   abfd->tdata.any = (void *) sec;
 
 
   abfd->tdata.any = (void *) sec;
 

-  if (bfd_get_arch_info (abfd) != NULL)
-    {
-      if ((bfd_get_arch_info (abfd)->arch == bfd_arch_unknown)
-          && (bfd_external_binary_architecture != bfd_arch_unknown))
-        bfd_set_arch_info (abfd, bfd_lookup_arch
-                          (bfd_external_binary_architecture, bfd_external_machine));
-    }
-
-  return abfd->xvec;
+  return _bfd_no_cleanup;

 }
 
 #define binary_close_and_cleanup     _bfd_generic_close_and_cleanup
 }
 
 #define binary_close_and_cleanup     _bfd_generic_close_and_cleanup


@@ -142,7 +129,7 @@ mangle_name (bfd *abfd, char *suffix)
          + strlen (suffix)
          + sizeof "_binary__");
 
          + strlen (suffix)
          + sizeof "_binary__");
 

-  buf = bfd_alloc (abfd, size);
+  buf = (char *) bfd_alloc (abfd, size);

   if (buf == NULL)
     return "";
 
   if (buf == NULL)
     return "";
 


@@ -164,11 +151,11 @@ binary_canonicalize_symtab (bfd *abfd, asymbol **alocation)
   asection *sec = (asection *) abfd->tdata.any;
   asymbol *syms;
   unsigned int i;
   asection *sec = (asection *) abfd->tdata.any;
   asymbol *syms;
   unsigned int i;

-  bfd_size_type amt = BIN_SYMS * sizeof (asymbol);
+  size_t amt = BIN_SYMS * sizeof (asymbol);

 
 

-  syms = bfd_alloc (abfd, amt);
+  syms = (asymbol *) bfd_alloc (abfd, amt);

   if (syms == NULL)
   if (syms == NULL)

-    return 0;
+    return -1;

 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;
 
   /* Start symbol.  */
   syms[0].the_bfd = abfd;


@@ -203,6 +190,8 @@ binary_canonicalize_symtab (bfd *abfd, asymbol **alocation)
 
 #define binary_make_empty_symbol  _bfd_generic_make_empty_symbol
 #define binary_print_symbol       _bfd_nosymbols_print_symbol
 
 #define binary_make_empty_symbol  _bfd_generic_make_empty_symbol
 #define binary_print_symbol       _bfd_nosymbols_print_symbol

+#define binary_get_symbol_version_string \
+  _bfd_nosymbols_get_symbol_version_string

 
 /* Get information about a symbol.  */
 
 
 /* Get information about a symbol.  */
 


@@ -214,17 +203,15 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
   bfd_symbol_info (symbol, ret);
 }
 
   bfd_symbol_info (symbol, ret);
 }
 

-#define binary_bfd_is_local_label_name      bfd_generic_is_local_label_name
-#define binary_get_lineno                  _bfd_nosymbols_get_lineno
-#define binary_find_nearest_line           _bfd_nosymbols_find_nearest_line
-#define binary_find_inliner_info           _bfd_nosymbols_find_inliner_info
-#define binary_bfd_make_debug_symbol       _bfd_nosymbols_bfd_make_debug_symbol
-#define binary_read_minisymbols            _bfd_generic_read_minisymbols
-#define binary_minisymbol_to_symbol        _bfd_generic_minisymbol_to_symbol
-#define binary_bfd_reloc_type_lookup       _bfd_norelocs_bfd_reloc_type_lookup
-#define binary_get_reloc_upper_bound        ((long (*) (bfd *, asection *)) bfd_0l)
-#define binary_canonicalize_reloc           ((long (*) (bfd *, asection *, arelent **, asymbol **)) bfd_0l)
-#define binary_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define binary_bfd_is_local_label_name     bfd_generic_is_local_label_name
+#define binary_get_lineno                 _bfd_nosymbols_get_lineno
+#define binary_find_nearest_line          _bfd_nosymbols_find_nearest_line
+#define binary_find_line                  _bfd_nosymbols_find_line
+#define binary_find_inliner_info          _bfd_nosymbols_find_inliner_info
+#define binary_bfd_make_debug_symbol      _bfd_nosymbols_bfd_make_debug_symbol
+#define binary_read_minisymbols                   _bfd_generic_read_minisymbols
+#define binary_minisymbol_to_symbol       _bfd_generic_minisymbol_to_symbol
+#define binary_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false

 
 /* Set the architecture of a binary file.  */
 #define binary_set_arch_mach _bfd_generic_set_arch_mach
 
 /* Set the architecture of a binary file.  */
 #define binary_set_arch_mach _bfd_generic_set_arch_mach


@@ -248,8 +235,8 @@ binary_set_section_contents (bfd *abfd,
       asection *s;
 
       /* The lowest section LMA sets the virtual address of the start
       asection *s;
 
       /* The lowest section LMA sets the virtual address of the start

-         of the file.  We use this to set the file position of all the
-         sections.  */
+        of the file.  We use this to set the file position of all the
+        sections.  */

       found_low = FALSE;
       low = 0;
       for (s = abfd->sections; s != NULL; s = s->next)
       found_low = FALSE;
       low = 0;
       for (s = abfd->sections; s != NULL; s = s->next)


@@ -265,7 +252,9 @@ binary_set_section_contents (bfd *abfd,
 
       for (s = abfd->sections; s != NULL; s = s->next)
        {
 
       for (s = abfd->sections; s != NULL; s = s->next)
        {

-         s->filepos = s->lma - low;
+         unsigned int opb = bfd_octets_per_byte (abfd, s);
+
+         s->filepos = (s->lma - low) * opb;

 
          /* Skip following warning check for sections that will not
             occupy file space.  */
 
          /* Skip following warning check for sections that will not
             occupy file space.  */


@@ -282,10 +271,11 @@ binary_set_section_contents (bfd *abfd,
             have.  */
 
          if (s->filepos < 0)
             have.  */
 
          if (s->filepos < 0)

-           (*_bfd_error_handler)
-             (_("Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."),
-              bfd_get_section_name (abfd, s),
-              (unsigned long) s->filepos);
+           _bfd_error_handler
+             /* xgettext:c-format */
+             (_("warning: writing section `%pA' at huge (ie negative) "
+                "file offset"),
+              s);

        }
 
       abfd->output_has_begun = TRUE;
        }
 
       abfd->output_has_begun = TRUE;


@@ -312,19 +302,25 @@ binary_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 #define binary_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
 }
 
 #define binary_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents

-#define binary_bfd_relax_section                   bfd_generic_relax_section
-#define binary_bfd_gc_sections                     bfd_generic_gc_sections
-#define binary_bfd_merge_sections                  bfd_generic_merge_sections
-#define binary_bfd_is_group_section                bfd_generic_is_group_section
-#define binary_bfd_discard_group                   bfd_generic_discard_group
-#define binary_section_already_linked             _bfd_generic_section_already_linked
-#define binary_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
-#define binary_bfd_link_hash_table_free           _bfd_generic_link_hash_table_free
-#define binary_bfd_link_just_syms                 _bfd_generic_link_just_syms
-#define binary_bfd_link_add_symbols               _bfd_generic_link_add_symbols
-#define binary_bfd_final_link                     _bfd_generic_final_link
-#define binary_bfd_link_split_section             _bfd_generic_link_split_section
-#define binary_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define binary_bfd_relax_section                  bfd_generic_relax_section
+#define binary_bfd_gc_sections                    bfd_generic_gc_sections
+#define binary_bfd_lookup_section_flags                   bfd_generic_lookup_section_flags
+#define binary_bfd_merge_sections                 bfd_generic_merge_sections
+#define binary_bfd_is_group_section               bfd_generic_is_group_section
+#define binary_bfd_group_name                     bfd_generic_group_name
+#define binary_bfd_discard_group                  bfd_generic_discard_group
+#define binary_section_already_linked            _bfd_generic_section_already_linked
+#define binary_bfd_define_common_symbol                   bfd_generic_define_common_symbol
+#define binary_bfd_link_hide_symbol               _bfd_generic_link_hide_symbol
+#define binary_bfd_define_start_stop              bfd_generic_define_start_stop
+#define binary_bfd_link_hash_table_create        _bfd_generic_link_hash_table_create
+#define binary_bfd_link_just_syms                _bfd_generic_link_just_syms
+#define binary_bfd_copy_link_hash_symbol_type    _bfd_generic_copy_link_hash_symbol_type
+#define binary_bfd_link_add_symbols              _bfd_generic_link_add_symbols
+#define binary_bfd_final_link                    _bfd_generic_final_link
+#define binary_bfd_link_split_section            _bfd_generic_link_split_section
+#define binary_get_section_contents_in_window    _bfd_generic_get_section_contents_in_window
+#define binary_bfd_link_check_relocs             _bfd_generic_link_check_relocs

 
 const bfd_target binary_vec =
 {
 
 const bfd_target binary_vec =
 {


@@ -338,6 +334,7 @@ const bfd_target binary_vec =
   0,                           /* symbol_leading_char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
   0,                           /* symbol_leading_char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */

+  255,                         /* 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 */


@@ -351,16 +348,16 @@ const bfd_target binary_vec =
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format */
     _bfd_dummy_target,
   },
   {                            /* bfd_set_format */

-    bfd_false,
+    _bfd_bool_bfd_false_error,

     binary_mkobject,
     binary_mkobject,

-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
   {                            /* bfd_write_contents */
   },
   {                            /* bfd_write_contents */

-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_true,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,

   },
 
   BFD_JUMP_TABLE_GENERIC (binary),
   },
 
   BFD_JUMP_TABLE_GENERIC (binary),


@@ -368,7 +365,7 @@ const bfd_target binary_vec =
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (binary),
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (binary),

-  BFD_JUMP_TABLE_RELOCS (binary),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),

   BFD_JUMP_TABLE_WRITE (binary),
   BFD_JUMP_TABLE_LINK (binary),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
   BFD_JUMP_TABLE_WRITE (binary),
   BFD_JUMP_TABLE_LINK (binary),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),