gdb/testsuite: Fix race condition in gdb.base/skip.exp

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

diff --git a/bfd/srec.c b/bfd/srec.c
index 66cc72fea8c7b49f824772e4de2259479a3e7c7e..a370b775bc90c0d89906a991c681a3adf599474e 100644 (file)
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -1,5 +1,5 @@
 /* BFD back-end for s-record objects.
-   Copyright (C) 1990-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -885,7 +885,7 @@ srec_set_section_contents (bfd *abfd,
                           file_ptr offset,
                           bfd_size_type bytes_to_do)
 {
-  int opb = bfd_octets_per_byte (abfd);
+  int opb = bfd_octets_per_byte (abfd, NULL);
   tdata_type *tdata = abfd->tdata.srec_data;
   srec_data_list_type *entry;
 
@@ -1053,7 +1053,8 @@ srec_write_section (bfd *abfd,
       if (octets_this_chunk > _bfd_srec_len)
        octets_this_chunk = _bfd_srec_len;
 
-      address = list->where + octets_written / bfd_octets_per_byte (abfd);
+      address = list->where + (octets_written
+                              / bfd_octets_per_byte (abfd, NULL));
 
       if (! srec_write_record (abfd,
                               tdata->type,
@@ -1275,6 +1276,7 @@ srec_print_symbol (bfd *abfd,
 #define srec_bfd_lookup_section_flags            bfd_generic_lookup_section_flags
 #define srec_bfd_merge_sections                          bfd_generic_merge_sections
 #define srec_bfd_is_group_section                bfd_generic_is_group_section
+#define srec_bfd_group_name                      bfd_generic_group_name
 #define srec_bfd_discard_group                   bfd_generic_discard_group
 #define srec_section_already_linked              _bfd_generic_section_already_linked
 #define srec_bfd_define_common_symbol            bfd_generic_define_common_symbol