2003-06-01 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/elfread.c b/gdb/elfread.c
index ba8fc490a7d9c58e36a671a8dd6c0539ec37acfe..7aee37cc5db37685ce7c0f5e5607d8d692a3976b 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1,7 +1,8 @@
 /* Read ELF (Executable and Linking Format) object files for GDB.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002
-   Free Software Foundation, Inc.
+
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
    Written by Fred Fish at Cygnus Support.
 
    This file is part of GDB.
@@ -346,10 +347,10 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
                    /* Looks like a compiler-generated label.  Skip
                       it.  The assembler should be skipping these (to
                       keep executables small), but apparently with
-                      gcc on the (OBSOLETE) delta m88k SVR4, it
-                      loses.  So to have us check too should be
-                      harmless (but I encourage people to fix this in
-                      the assembler instead of adding checks here).  */
+                      gcc on the (deleted) delta m88k SVR4, it loses.
+                      So to have us check too should be harmless (but
+                      I encourage people to fix this in the assembler
+                      instead of adding checks here).  */
                    continue;
                  else
                    {
@@ -541,6 +542,15 @@ elf_symfile_read (struct objfile *objfile, int mainline)
 
   elf_symtab_read (objfile, 1);
 
+  /* Install any minimal symbols that have been collected as the current
+     minimal symbols for this objfile.  The debug readers below this point
+     should not generate new minimal symbols; if they do it's their
+     responsibility to install them.  "mdebug" appears to be the only one
+     which will do this.  */
+
+  install_minimal_symbols (objfile);
+  do_cleanups (back_to);
+
   /* Now process debugging information, which is contained in
      special ELF sections. */
 
@@ -590,8 +600,7 @@ elf_symfile_read (struct objfile *objfile, int mainline)
       if (str_sect)
        elfstab_build_psymtabs (objfile,
                                mainline,
-                               ei.stabsect->filepos,
-                               bfd_section_size (abfd, ei.stabsect),
+                               ei.stabsect,
                                str_sect->filepos,
                                bfd_section_size (abfd, str_sect));
     }
@@ -611,13 +620,6 @@ elf_symfile_read (struct objfile *objfile, int mainline)
 
   if (DWARF2_BUILD_FRAME_INFO_P ())
     DWARF2_BUILD_FRAME_INFO(objfile);
-
-  /* Install any minimal symbols that have been collected as the current
-     minimal symbols for this objfile. */
-
-  install_minimal_symbols (objfile);
-
-  do_cleanups (back_to);
 }
 
 /* This cleans up the objfile's sym_stab_info pointer, and the chain of