AArch64: Revert setting of elf class in linker stub.

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

diff --git a/bfd/binary.c b/bfd/binary.c
index c467b429f644c1397322eec3aefdfb7ba8bbfe1d..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.
@@ -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
@@ -307,6 +307,7 @@ 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