Cleanup bfd_close() cleanups.

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

diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index e9893caa26a908be5e7bc20bc9d6746903a169d4..18727c2b923024b162ea60de4bdf3efb6ecd87c7 100644 (file)
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -704,7 +704,6 @@ set_cu_language (dip)
    SYNOPSIS
 
    void dwarf_build_psymtabs (struct objfile *objfile,
-   struct section_offsets *section_offsets,
    int mainline, file_ptr dbfoff, unsigned int dbfsize,
    file_ptr lnoffset, unsigned int lnsize)
 
@@ -728,10 +727,9 @@ set_cu_language (dip)
  */
 
 void
-dwarf_build_psymtabs (objfile, section_offsets, mainline, dbfoff, dbfsize,
+dwarf_build_psymtabs (objfile, mainline, dbfoff, dbfsize,
                      lnoffset, lnsize)
      struct objfile *objfile;
-     struct section_offsets *section_offsets;
      int mainline;
      file_ptr dbfoff;
      unsigned int dbfsize;
@@ -765,8 +763,8 @@ dwarf_build_psymtabs (objfile, section_offsets, mainline, dbfoff, dbfsize,
 
   /* Save the relocation factor where everybody can see it.  */
 
-  base_section_offsets = section_offsets;
-  baseaddr = ANOFFSET (section_offsets, 0);
+  base_section_offsets = objfile->section_offsets;
+  baseaddr = ANOFFSET (objfile->section_offsets, 0);
 
   /* Follow the compilation unit sibling chain, building a partial symbol
      table entry for each one.  Save enough information about each compilation
@@ -1868,11 +1866,6 @@ read_func_scope (dip, thisdie, enddie, objfile)
       objfile->ei.entry_func_lowpc = dip->at_low_pc;
       objfile->ei.entry_func_highpc = dip->at_high_pc;
     }
-  if (STREQ (dip->at_name, "main"))    /* FIXME: hardwired name */
-    {
-      objfile->ei.main_func_lowpc = dip->at_low_pc;
-      objfile->ei.main_func_highpc = dip->at_high_pc;
-    }
   new = push_context (0, dip->at_low_pc);
   new->name = new_symbol (dip, objfile);
   list_in_scope = &local_symbols;
@@ -2456,8 +2449,7 @@ psymtab_to_symtab_1 (pst)
          if (DBLENGTH (pst))   /* Otherwise it's a dummy */
            {
              buildsym_init ();
-             old_chain = make_cleanup ((make_cleanup_func)
-                                       really_free_pendings, 0);
+             old_chain = make_cleanup (really_free_pendings, 0);
              read_ofile_symtab (pst);
              if (info_verbose)
                {