Re: Regression on prelinked-sepdebug-shlibs

[Tristan Gingold <gingold@adacore.com>]

Jan,

can you try and/or comment this patch before I officially submit it ?  No sepdebug.exp regressions.

Tristan.


2010-01-04  Tristan Gingold  <gingold@adacore.com>

	* symfile.c (build_section_addr_info_from_objfile): New function.
	(symbol_file_add_separate): Don't use offsets from objfile but
	built an addr info.

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 11bc2af..d6ecf0d 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -384,6 +384,38 @@ build_section_addr_info_from_section_table (const struct target_section *start,
   return sap;
 }
 
+/* Create a section_addr_info from section offsets in OBJFILE.  Return NULL
+   if all offsets are 0.  */
+
+static struct section_addr_info *
+build_section_addr_info_from_objfile (const struct objfile *objfile)
+{
+  struct section_addr_info *sap;
+  int i;
+  struct bfd_section *sec;
+
+  /* In most cases, the offsets are 0.  In this case we return NULL to reduce
+     overhead.  */
+  for (i = 0; i < objfile->num_sections; i++)
+    if (objfile->section_offsets->offsets[i])
+      break;
+  if (i >= objfile->num_sections)
+    return NULL;
+
+  sap = alloc_section_addr_info (objfile->num_sections);
+  for (i = 0, sec = objfile->obfd->sections;
+       i < objfile->num_sections;
+       i++, sec = sec->next)
+    {
+      gdb_assert (sec != NULL);
+      sap->other[i].addr = bfd_get_section_vma (objfile->obfd, sec)
+        + objfile->section_offsets->offsets[i];
+      sap->other[i].name = xstrdup (bfd_get_section_name (objfile->obfd, sec));
+      sap->other[i].sectindex = sec->index;
+    }
+  return sap;
+}
+
 
 /* Free all memory allocated by build_section_addr_info_from_section_table. */
 
@@ -1042,16 +1074,26 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
 void
 symbol_file_add_separate (bfd *bfd, int symfile_flags, struct objfile *objfile)
 {
+  struct section_addr_info *sap;
+  struct cleanup *my_cleanup;
+
   /* Currently only one separate debug objfile is supported.  */
   gdb_assert (objfile && objfile->separate_debug_objfile == NULL);
 
+  sap = build_section_addr_info_from_objfile (objfile);
+  if (sap)
+    my_cleanup = make_cleanup_free_section_addr_info (sap);
+
   objfile->separate_debug_objfile =
     symbol_file_add_with_addrs_or_offsets
     (bfd, symfile_flags,
-     0, /* No addr table.  */
-     objfile->section_offsets, objfile->num_sections,
+     sap, NULL, 0,
      objfile->flags & (OBJF_REORDERED | OBJF_SHARED | OBJF_READNOW
 		       | OBJF_USERLOADED));
+
+  if (sap)
+    do_cleanups (my_cleanup);
+
   objfile->separate_debug_objfile->separate_debug_objfile_backlink
     = objfile;