* infrun.c (handle_inferior_event): Do not insert breakpoints at

	TARGET_WAITKIND_LOADED events during startup (i.e. in the shell).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e794a3f79b44a9e4dda1d4a15c5854f86b5f486..6d67b1db5951c24f885327657838567445b8e64f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-03  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * infrun.c (handle_inferior_event): Do not insert breakpoints at
+       TARGET_WAITKIND_LOADED events during startup (i.e. in the shell).
+
 2008-05-03  Pedro Alves  <pedro@codesourcery.com>
 
        * parse.c (parse_exp_in_context): Don't override

diff --git a/gdb/infrun.c b/gdb/infrun.c
index a3e7695f5028aa154934f16c2e3a7346492e9ddb..3944c0f08bb1026fbb24d50b85fb6c28e703ddaa 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1817,7 +1817,8 @@ handle_inferior_event (struct execution_control_state *ecs)
        {
          /* Loading of shared libraries might have changed breakpoint
             addresses.  Make sure new breakpoints are inserted.  */
-         if (!breakpoints_always_inserted_mode ())
+         if (stop_soon == NO_STOP_QUIETLY
+             && !breakpoints_always_inserted_mode ())
            insert_breakpoints ();
          resume (0, TARGET_SIGNAL_0);
          prepare_to_wait (ecs);