* objfiles.c (objfile_relocate): Use gdb_bfd_count_sections instead

[deliverable/binutils-gdb.git] / gdb / solib-target.c

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 23cb2e7f14e313da9c3f6ea9c7e36fd1e384f9aa..483e5f9f022bc6176fb53c1c30c0fb2d23736268 100644 (file)
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -333,14 +333,13 @@ static void
 solib_target_relocate_section_addresses (struct so_list *so,
                                         struct target_section *sec)
 {
-  int flags = bfd_get_section_flags (sec->bfd, sec->the_bfd_section);
   CORE_ADDR offset;
 
   /* Build the offset table only once per object file.  We can not do
      it any earlier, since we need to open the file first.  */
   if (so->lm_info->offsets == NULL)
     {
-      int num_sections = bfd_count_sections (so->abfd);
+      int num_sections = gdb_bfd_count_sections (so->abfd);
 
       so->lm_info->offsets = xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections));
 
@@ -457,7 +456,8 @@ Could not relocate shared library \"%s\": bad offsets"), so->so_name);
        }
     }
 
-  offset = so->lm_info->offsets->offsets[sec->the_bfd_section->index];
+  offset = so->lm_info->offsets->offsets[gdb_bfd_section_index (sec->bfd,
+                                                               sec->the_bfd_section)];
   sec->addr += offset;
   sec->endaddr += offset;
 }