* symfile.c (reread_symbols): Include bfd_errmsg string in error

[deliverable/binutils-gdb.git] / gdb / objfiles.c

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index dfac45e8cff0264535800947e418e66c3418b02f..5cd01e5210e2223897d95c71882f0a079c5be7ac 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -77,14 +77,13 @@ add_to_objfile_sections (abfd, asect, objfile_p_char)
   flagword aflag;
 
   aflag = bfd_get_section_flags (abfd, asect);
-  /* FIXME, we need to handle BSS segment here...it alloc's but doesn't load */
-  if (!(aflag & SEC_LOAD))
+  if (!(aflag & SEC_ALLOC))
     return;
   if (0 == bfd_section_size (abfd, asect))
     return;
   section.offset = 0;
   section.objfile = objfile;
-  section.sec_ptr = asect;
+  section.the_bfd_section = asect;
   section.addr = bfd_section_vma (abfd, asect);
   section.endaddr = section.addr + bfd_section_size (abfd, asect);
   obstack_grow (&objfile->psymbol_obstack, &section, sizeof(section));
@@ -99,8 +98,11 @@ int
 build_objfile_section_table (objfile)
      struct objfile *objfile;
 {
-  if (objfile->sections)
-    abort();
+  /* objfile->sections can be already set when reading a mapped symbol
+     file.  I believe that we do need to rebuild the section table in
+     this case (we rebuild other things derived from the bfd), but we
+     can't free the old one (it's in the psymbol_obstack).  So we just
+     waste some memory.  */
 
   objfile->sections_end = 0;
   bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *)objfile);
@@ -121,6 +123,7 @@ allocate_objfile (abfd, mapped)
      int mapped;
 {
   struct objfile *objfile = NULL;
+  struct objfile *last_one = NULL;
 
   mapped |= mapped_symbol_files;
 
@@ -252,14 +255,21 @@ allocate_objfile (abfd, mapped)
   if (build_objfile_section_table (objfile))
     {
       error ("Can't find the file sections in `%s': %s", 
-            objfile -> name, bfd_errmsg (bfd_error));
+            objfile -> name, bfd_errmsg (bfd_get_error ()));
     }
 
-  /* Push this file onto the head of the linked list of other such files. */
-
-  objfile -> next = object_files;
-  object_files = objfile;
+  /* Add this file onto the tail of the linked list of other such files. */
 
+  objfile -> next = NULL;
+  if (object_files == NULL)
+    object_files = objfile;
+  else
+    {
+      for (last_one = object_files;
+          last_one -> next;
+          last_one = last_one -> next);
+      last_one -> next = objfile;
+    }
   return (objfile);
 }
 
@@ -331,7 +341,9 @@ free_objfile (objfile)
   if (objfile -> obfd != NULL)
     {
       char *name = bfd_get_filename (objfile->obfd);
-      bfd_close (objfile -> obfd);
+      if (!bfd_close (objfile -> obfd))
+       warning ("cannot close \"%s\": %s",
+                name, bfd_errmsg (bfd_get_error ()));
       free (name);
     }
 
@@ -448,7 +460,7 @@ objfile_relocate (objfile, new_offsets)
   {
     struct symtab *s;
 
-    for (s = objfile->symtabs; s; s = s->next)
+    ALL_OBJFILE_SYMTABS (objfile, s)
       {
        struct linetable *l;
        struct blockvector *bv;
@@ -490,6 +502,15 @@ objfile_relocate (objfile, new_offsets)
                    SYMBOL_VALUE_ADDRESS (sym) +=
                      ANOFFSET (delta, SYMBOL_SECTION (sym));
                  }
+#ifdef MIPS_EFI_SYMBOL_NAME
+               /* Relocate Extra Function Info for ecoff.  */
+
+               else
+                 if (SYMBOL_CLASS (sym) == LOC_CONST
+                     && SYMBOL_NAMESPACE (sym) == LABEL_NAMESPACE
+                     && STRCMP (SYMBOL_NAME (sym), MIPS_EFI_SYMBOL_NAME) == 0)
+                   ecoff_relocate_efi (sym, ANOFFSET (delta, s->block_line_section));
+#endif
              }
          }
       }
@@ -536,6 +557,58 @@ objfile_relocate (objfile, new_offsets)
     for (i = 0; i < objfile->num_sections; ++i)
       ANOFFSET (objfile->section_offsets, i) = ANOFFSET (new_offsets, i);
   }
+
+  {
+    struct obj_section *s;
+    bfd *abfd;
+
+    abfd = symfile_objfile->obfd;
+
+    for (s = symfile_objfile->sections;
+        s < symfile_objfile->sections_end; ++s)
+      {
+       flagword flags;
+
+       flags = bfd_get_section_flags (abfd, s->the_bfd_section);
+
+       if (flags & SEC_CODE)
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_TEXT);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_TEXT);
+         }
+       else if (flags & (SEC_DATA | SEC_LOAD))
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_DATA);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_DATA);
+         }
+       else if (flags & SEC_ALLOC)
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_BSS);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_BSS);
+         }
+      }
+  }
+
+  if (objfile->ei.entry_point != ~0)
+    objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT);
+
+  if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
+
+  if (objfile->ei.entry_file_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.entry_file_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_file_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
+
+  if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
 }
 \f
 /* Many places in gdb want to test just to see if we have any partial
@@ -639,7 +712,7 @@ open_existing_mapped_file (symsfilename, mtime, mapped)
        {
          if (error_pre_print)
            {
-             printf (error_pre_print);
+             printf_unfiltered (error_pre_print);
            }
          print_sys_errmsg (symsfilename, errno);
        }
@@ -709,7 +782,7 @@ open_mapped_file (filename, mtime, mapped)
        {
          if (error_pre_print)
            {
-             printf (error_pre_print);
+             printf_unfiltered (error_pre_print);
            }
          print_sys_errmsg (symsfilename, errno);
        }
@@ -783,3 +856,23 @@ find_pc_section(pc)
 
   return(NULL);
 }
+
+/* In SVR4, we recognize a trampoline by it's section name. 
+   That is, if the pc is in a section named ".plt" then we are in
+   a trampoline.  */
+
+int
+in_plt_section(pc, name)
+     CORE_ADDR pc;
+     char *name;
+{
+  struct obj_section *s;
+  int retval = 0;
+  
+  s = find_pc_section(pc);
+  
+  retval = (s != NULL
+           && s->the_bfd_section->name != NULL
+           && STREQ (s->the_bfd_section->name, ".plt"));
+  return(retval);
+}