Patch from David Mosberger.

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

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index ba55bbb56b7602c3c89992d57d136a2f0d799ed1..d62b28f4547af16cb0a4f0b5070da5121a4a320b 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include "gdb_stat.h"
 #include <fcntl.h>
-#include "obstack.h"
+#include "gdb_obstack.h"
 #include "gdb_string.h"
 
 #include "breakpoint.h"
@@ -52,11 +52,11 @@ static int open_existing_mapped_file (char *, long, int);
 
 static int open_mapped_file (char *filename, long mtime, int flags);
 
-static PTR map_to_file (int);
+static void *map_to_file (int);
 
 #endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
 
-static void add_to_objfile_sections (bfd *, sec_ptr, PTR);
+static void add_to_objfile_sections (bfd *, sec_ptr, void *);
 
 /* Externally visible variables that are owned by this module.
    See declarations in objfile.h for more info. */
@@ -82,7 +82,7 @@ int mapped_symbol_files;      /* Try to use mapped symbol files */
    the end of the table (objfile->sections_end). */
 
 static void
-add_to_objfile_sections (bfd *abfd, sec_ptr asect, PTR objfile_p_char)
+add_to_objfile_sections (bfd *abfd, sec_ptr asect, void *objfile_p_char)
 {
   struct objfile *objfile = (struct objfile *) objfile_p_char;
   struct obj_section section;
@@ -178,7 +178,7 @@ allocate_objfile (bfd *abfd, int flags)
                             flags);
       if (fd >= 0)
        {
-         PTR md;
+         void *md;
 
          if ((md = map_to_file (fd)) == NULL)
            {
@@ -333,6 +333,30 @@ allocate_objfile (bfd *abfd, int flags)
   return (objfile);
 }
 
+/* Put one object file before a specified on in the global list.
+   This can be used to make sure an object file is destroyed before
+   another when using ALL_OBJFILES_SAFE to free all objfiles. */
+void
+put_objfile_before (struct objfile *objfile, struct objfile *before_this)
+{
+  struct objfile **objp;
+
+  unlink_objfile (objfile);
+  
+  for (objp = &object_files; *objp != NULL; objp = &((*objp)->next))
+    {
+      if (*objp == before_this)
+       {
+         objfile->next = *objp;
+         *objp = objfile;
+         return;
+       }
+    }
+  
+  internal_error (__FILE__, __LINE__,
+                 "put_objfile_before: before objfile not in list");
+}
+
 /* Put OBJFILE at the front of the list.  */
 
 void
@@ -405,6 +429,18 @@ unlink_objfile (struct objfile *objfile)
 void
 free_objfile (struct objfile *objfile)
 {
+  if (objfile->separate_debug_objfile)
+    {
+      free_objfile (objfile->separate_debug_objfile);
+    }
+  
+  if (objfile->separate_debug_objfile_backlink)
+    {
+      /* We freed the separate debug file, make sure the base objfile
+        doesn't reference it.  */
+      objfile->separate_debug_objfile_backlink->separate_debug_objfile = NULL;
+    }
+  
   /* First do any symbol file specific actions required when we are
      finished with a particular symbol file.  Note that if the objfile
      is using reusable symbol information (via mmalloc) then each of
@@ -900,13 +936,13 @@ open_mapped_file (char *filename, long mtime, int flags)
   return (fd);
 }
 
-static PTR
+static void *
 map_to_file (int fd)
 {
-  PTR md;
+  void *md;
   CORE_ADDR mapto;
 
-  md = mmalloc_attach (fd, (PTR) 0);
+  md = mmalloc_attach (fd, 0);
   if (md != NULL)
     {
       mapto = (CORE_ADDR) mmalloc_getkey (md, 1);
@@ -919,7 +955,7 @@ map_to_file (int fd)
       else if (mapto != (CORE_ADDR) NULL)
        {
          /* This mapping file needs to be remapped at "mapto" */
-         md = mmalloc_attach (fd, (PTR) mapto);
+         md = mmalloc_attach (fd, mapto);
        }
       else
        {
@@ -931,10 +967,10 @@ map_to_file (int fd)
                 address selected by mmap, we must truncate it before trying
                 to do an attach at the address we want. */
              ftruncate (fd, 0);
-             md = mmalloc_attach (fd, (PTR) mapto);
+             md = mmalloc_attach (fd, mapto);
              if (md != NULL)
                {
-                 mmalloc_setkey (md, 1, (PTR) mapto);
+                 mmalloc_setkey (md, 1, mapto);
                }
            }
        }