X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fbinary.c;h=999d41c0611403c4ee34732fdce2d5e384f58f59;hb=6d8b70895c19a3eb4cd44742c09af323031bc9a2;hp=2bc9ff0bc9c6643973b4a4bef28c17947e3c5a64;hpb=12ef3f5a7c5a6b89964842fd3da047b8d07dec91;p=binutils-gdb.git diff --git a/bfd/binary.c b/bfd/binary.c index 2bc9ff0bc9c..999d41c0611 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -1,5 +1,5 @@ /* BFD back-end for binary objects. - Copyright (C) 1994-2018 Free Software Foundation, Inc. + Copyright (C) 1994-2022 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, This file is part of BFD, the Binary File Descriptor library. @@ -19,10 +19,10 @@ 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 may be used as an output format for objcopy in order to - generate raw binary data. +/* This is a BFD backend which may be used to read or write binary + objects. Historically, it was used as an output format for objcopy + in order to generate raw binary data, but is now used for other + purposes as well. This is very simple. The only complication is that the real data will start at some address X, and in some cases we will not want to @@ -43,17 +43,17 @@ /* Create a binary object. Invoked via bfd_set_format. */ -static bfd_boolean +static bool binary_mkobject (bfd *abfd ATTRIBUTE_UNUSED) { - return TRUE; + return true; } /* Any file may be considered to be a binary file, provided the target 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; @@ -86,7 +86,7 @@ binary_object_p (bfd *abfd) abfd->tdata.any = (void *) sec; - return abfd->xvec; + return _bfd_no_cleanup; } #define binary_close_and_cleanup _bfd_generic_close_and_cleanup @@ -95,17 +95,17 @@ binary_object_p (bfd *abfd) /* Get contents of the only section. */ -static bfd_boolean +static bool binary_get_section_contents (bfd *abfd, - asection *section ATTRIBUTE_UNUSED, + asection *section, void * location, file_ptr offset, bfd_size_type count) { - if (bfd_seek (abfd, offset, SEEK_SET) != 0 + if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0 || bfd_bread (location, count, abfd) != count) - return FALSE; - return TRUE; + return false; + return true; } /* Return the amount of memory needed to read the symbol table. */ @@ -151,7 +151,7 @@ binary_canonicalize_symtab (bfd *abfd, asymbol **alocation) 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 = (asymbol *) bfd_alloc (abfd, amt); if (syms == NULL) @@ -211,14 +211,14 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, #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_boolean (*) (bfd *, asymbol *)) (bfd_boolean (*)) bfd_false) +#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 /* Write section contents of a binary file. */ -static bfd_boolean +static bool binary_set_section_contents (bfd *abfd, asection *sec, const void * data, @@ -226,19 +226,18 @@ binary_set_section_contents (bfd *abfd, bfd_size_type size) { if (size == 0) - return TRUE; + return true; if (! abfd->output_has_begun) { - unsigned int opb; - bfd_boolean found_low; + bool found_low; bfd_vma low; 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. */ - found_low = FALSE; + found_low = false; low = 0; for (s = abfd->sections; s != NULL; s = s->next) if (((s->flags @@ -248,12 +247,13 @@ binary_set_section_contents (bfd *abfd, && (! found_low || s->lma < low)) { low = s->lma; - found_low = TRUE; + found_low = true; } - opb = bfd_octets_per_byte (abfd); for (s = abfd->sections; s != NULL; s = s->next) { + unsigned int opb = bfd_octets_per_byte (abfd, s); + s->filepos = (s->lma - low) * opb; /* Skip following warning check for sections that will not @@ -273,21 +273,21 @@ binary_set_section_contents (bfd *abfd, if (s->filepos < 0) _bfd_error_handler /* xgettext:c-format */ - (_("warning: writing section `%A' at huge (ie negative) " + (_("warning: writing section `%pA' at huge (ie negative) " "file offset"), s); } - abfd->output_has_begun = TRUE; + abfd->output_has_begun = true; } /* We don't want to output anything for a section that is neither loaded nor allocated. The contents of such a section are not meaningful in the binary format. */ if ((sec->flags & (SEC_LOAD | SEC_ALLOC)) == 0) - return TRUE; + return true; if ((sec->flags & SEC_NEVER_LOAD) != 0) - return TRUE; + return true; return _bfd_generic_set_section_contents (abfd, sec, data, offset, size); } @@ -307,9 +307,11 @@ binary_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #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 @@ -333,6 +335,7 @@ const bfd_target binary_vec = ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ 255, /* match priority. */ + TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */ 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 */ @@ -346,16 +349,16 @@ const bfd_target binary_vec = _bfd_dummy_target, }, { /* bfd_set_format */ - bfd_false, + _bfd_bool_bfd_false_error, binary_mkobject, - bfd_false, - bfd_false, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, }, { /* 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),