* objfiles.c (objfile_relocate): Use gdb_bfd_count_sections instead

	of bfd_count_sections.
	* solib-target.c (solib_target_relocate_section_addresses): Ditto.
	* symfile.c (default_symfile_offsets): Ditto.
	(syms_from_objfile_1): Ditto.  Make dummy addrs list an array of
	one entry, not bfd_count_sections entries.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a94f659..bc5ba27 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-03  Doug Evans  <dje@google.com>
+
+       * objfiles.c (objfile_relocate): Use gdb_bfd_count_sections instead
+       of bfd_count_sections.
+       * solib-target.c (solib_target_relocate_section_addresses): Ditto.
+       * symfile.c (default_symfile_offsets): Ditto.
+       (syms_from_objfile_1): Ditto.  Make dummy addrs list an array of
+       one entry, not bfd_count_sections entries.
+
 2013-05-03  Kevin Buettner  <kevinb@redhat.com>
 
        * rl78-tdep.c (rl78_register_reggroup_p): Include SP in the

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 93b7ba7..2e13421 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -880,7 +880,7 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
       addr_info_make_relative (objfile_addrs, debug_objfile->obfd);
 
       gdb_assert (debug_objfile->num_sections
-                 == bfd_count_sections (debug_objfile->obfd));
+                 == gdb_bfd_count_sections (debug_objfile->obfd));
       new_debug_offsets = 
        xmalloc (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections));
       make_cleanup (xfree, new_debug_offsets);

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 0ad29ba..483e5f9 100644 (file)
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -339,7 +339,7 @@ solib_target_relocate_section_addresses (struct so_list *so,
      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));
 

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 3e66bd1..979a8dd 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -678,7 +678,7 @@ void
 default_symfile_offsets (struct objfile *objfile,
                         struct section_addr_info *addrs)
 {
-  objfile->num_sections = bfd_count_sections (objfile->obfd);
+  objfile->num_sections = gdb_bfd_count_sections (objfile->obfd);
   objfile->section_offsets = (struct section_offsets *)
     obstack_alloc (&objfile->objfile_obstack,
                   SIZEOF_N_SECTION_OFFSETS (objfile->num_sections));
@@ -948,7 +948,7 @@ syms_from_objfile_1 (struct objfile *objfile,
     {
       /* No symbols to load, but we still need to make sure
         that the section_offsets table is allocated.  */
-      int num_sections = bfd_count_sections (objfile->obfd);
+      int num_sections = gdb_bfd_count_sections (objfile->obfd);
       size_t size = SIZEOF_N_SECTION_OFFSETS (num_offsets);
 
       objfile->num_sections = num_sections;
@@ -967,8 +967,7 @@ syms_from_objfile_1 (struct objfile *objfile,
      no load address was specified.  */
   if (! addrs && ! offsets)
     {
-      local_addr
-       = alloc_section_addr_info (bfd_count_sections (objfile->obfd));
+      local_addr = alloc_section_addr_info (1);
       make_cleanup (xfree, local_addr);
       addrs = local_addr;
     }