* breakpoint.c (breakpoint_thread_match break_command_1):

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

diff --git a/gdb/osfsolib.c b/gdb/osfsolib.c
index a27243d941f5c9455d9dc141c75871b80adff46b..4006f172f8bbf88b4908327a0752fb39c74b1212 100644 (file)
--- a/gdb/osfsolib.c
+++ b/gdb/osfsolib.c
@@ -96,7 +96,7 @@ struct so_list {
   struct section_table *sections;
   struct section_table *sections_end;
   struct section_table *textsection;
-  bfd *bfd;
+  bfd *abfd;
 };
 
 static struct so_list *so_list_head;   /* List of known shared objects */
@@ -195,7 +195,7 @@ solib_map_sections (so)
             scratch_pathname, bfd_errmsg (bfd_error));
     }
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */
-  so -> bfd = abfd;
+  so -> abfd = abfd;
   abfd -> cacheable = true;
 
   if (!bfd_check_format (abfd, bfd_object))
@@ -670,10 +670,10 @@ clear_solib()
        {
          free ((PTR)so_list_head -> sections);
        }
-      if (so_list_head -> bfd)
+      if (so_list_head -> abfd)
        {
-         bfd_filename = bfd_get_filename (so_list_head -> bfd);
-         bfd_close (so_list_head -> bfd);
+         bfd_filename = bfd_get_filename (so_list_head -> abfd);
+         bfd_close (so_list_head -> abfd);
        }
       else
        /* This happens for the executable on SVR4.  */
@@ -742,13 +742,19 @@ solib_create_inferior_hook()
   stop_signal = 0;
   do
     {
-      target_resume (inferior_pid, 0, stop_signal);
+      target_resume (-1, 0, stop_signal);
       wait_for_inferior ();
     }
   while (stop_signal != SIGTRAP);
-  stop_soon_quietly = 0;
 
+  /*  solib_add will call reinit_frame_cache via symbol_file_add.
+      But we are stopped in the runtime loader and we do not have symbols
+      for the runtime loader. So heuristic_proc_start will be called
+      and will put out an annoying warning.
+      Resetting stop_soon_quietly after symbol loading suppresses
+      the warning.  */
   solib_add ((char *) 0, 0, (struct target_ops *) 0);
+  stop_soon_quietly = 0;
 }