* solist.h (struct target_so_ops): New member clear_so.

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

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index f155b9eb59ed874fb0e5f5ccd0419d950ed42651..ef9c23c46422063534701a01b0de1cfe210f35bd 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2343,11 +2343,11 @@ build_target_command_list (struct bp_location *bl)
            {
              /* Only go as far as the first NULL bytecode is
                 located.  */
-             if (!loc->cond_bytecode)
+             if (loc->cmd_bytecode == NULL)
                return;
 
-             free_agent_expr (loc->cond_bytecode);
-             loc->cond_bytecode = NULL;
+             free_agent_expr (loc->cmd_bytecode);
+             loc->cmd_bytecode = NULL;
            }
        }
     }
@@ -5367,11 +5367,7 @@ handle_solib_event (void)
      be adding them automatically.  Switch terminal for any messages
      produced by breakpoint_re_set.  */
   target_terminal_ours_for_output ();
-#ifdef SOLIB_ADD
-  SOLIB_ADD (NULL, 0, &current_target, auto_solib_add);
-#else
   solib_add (NULL, 0, &current_target, auto_solib_add);
-#endif
   target_terminal_inferior ();
 }
 
@@ -7417,11 +7413,7 @@ disable_breakpoints_in_shlibs (void)
         || (is_tracepoint (b)))
        && loc->pspace == current_program_space
        && !loc->shlib_disabled
-#ifdef PC_SOLIB
-       && PC_SOLIB (loc->address)
-#else
        && solib_name_from_address (loc->pspace, loc->address)
-#endif
        )
       {
        loc->shlib_disabled = 1;
@@ -13077,7 +13069,7 @@ static void
 momentary_bkpt_re_set (struct breakpoint *b)
 {
   /* Keep temporary breakpoints, which can be encountered when we step
-     over a dlopen call and SOLIB_ADD is resetting the breakpoints.
+     over a dlopen call and solib_add is resetting the breakpoints.
      Otherwise these should have been blown away via the cleanup chain
      or by breakpoint_init_inferior when we rerun the executable.  */
 }