gdb: Fix scrolling in TUI

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

diff --git a/bfd/binary.c b/bfd/binary.c
index 518b8452aa79b3f29009acba9e412112a8c20dd7..3e4b0d91cfc5110beb9f9fb963f75db76d200d57 100644 (file)
--- 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-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.
@@ -211,7 +211,7 @@ 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_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
@@ -230,7 +230,6 @@ binary_set_section_contents (bfd *abfd,
 
   if (! abfd->output_has_begun)
     {
-      unsigned int opb;
       bfd_boolean found_low;
       bfd_vma low;
       asection *s;
@@ -251,9 +250,10 @@ binary_set_section_contents (bfd *abfd,
            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,7 +273,7 @@ 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);
        }
@@ -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
@@ -346,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),