* linux-thread-db.c (thread_db_mourn_inferior): Remove breakpoints

	after mourning the inferior.

2 files changed, 9 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c76d6c8844f..3acfcf87967 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* linux-thread-db.c (thread_db_mourn_inferior): Remove breakpoints
+	after mourning the inferior.
+
 2006-01-24  Jim Blandy  <jimb@redhat.com>
 
 	* valarith.c (binop_user_defined_p): Handle refs to typedefs.
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 76b7d0cae7f..12914801475 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -1104,14 +1104,16 @@ thread_db_post_startup_inferior (ptid_t ptid)
 static void
 thread_db_mourn_inferior (void)
 {
-  remove_thread_event_breakpoints ();
-
   /* Forget about the child's process ID.  We shouldn't need it
      anymore.  */
   proc_handle.pid = 0;
 
   target_beneath->to_mourn_inferior ();
 
+  /* Delete the old thread event breakpoints.  Do this after mourning
+     the inferior, so that we don't try to uninsert them.  */
+  remove_thread_event_breakpoints ();
+
   /* Detach thread_db target ops.  */
   unpush_target (&thread_db_ops);
   using_thread_db = 0;