X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fbinary.c;h=999de0d8c41a4e7d8e5072de86983c1717ab900d;hb=081e778cb855581fe63a9b26aa582900da5d1a8b;hp=39237d081459e05a85288eebcd33a29185c45b06;hpb=4eca02287cf48e60ee89338ddd35f8d0d8257a51;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/binary.c b/bfd/binary.c index 39237d0814..999de0d8c4 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -1,5 +1,5 @@ /* BFD back-end for binary objects. - Copyright (C) 1994-2016 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support, This file is part of BFD, the Binary File Descriptor library. @@ -53,7 +53,7 @@ binary_mkobject (bfd *abfd ATTRIBUTE_UNUSED) 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 @@ -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) @@ -203,15 +203,15 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, 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_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_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 @@ -235,8 +235,8 @@ binary_set_section_contents (bfd *abfd, 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) @@ -252,7 +252,9 @@ binary_set_section_contents (bfd *abfd, 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. */ @@ -270,10 +272,10 @@ binary_set_section_contents (bfd *abfd, if (s->filepos < 0) _bfd_error_handler - (_("Warning: Writing section `%s' at huge (ie negative) " - "file offset 0x%lx."), - bfd_get_section_name (abfd, s), - (unsigned long) s->filepos); + /* xgettext:c-format */ + (_("warning: writing section `%pA' at huge (ie negative) " + "file offset"), + s); } abfd->output_has_begun = TRUE; @@ -300,22 +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_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_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_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 +#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 = { @@ -343,16 +348,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),