return (e1.reason == e2.reason
&& e1.error == e2.error
- && strcmp (e1.message, e2.message) == 0);
+ && strcmp (msg1, msg2) == 0);
}
/* See gdbcore.h. */
void
-exec_file_locate_attach (int pid, int from_tty)
+exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty)
{
char *exec_file, *full_exec_path = NULL;
struct cleanup *old_chain;
TRY
{
+ if (defer_bp_reset)
+ current_inferior ()->symfile_flags |= SYMFILE_DEFER_BP_RESET;
symbol_file_add_main (full_exec_path, from_tty);
}
CATCH (err, RETURN_MASK_ERROR)
warning ("%s", err.message);
}
END_CATCH
+ current_inferior ()->symfile_flags &= ~SYMFILE_DEFER_BP_RESET;
do_cleanups (old_chain);
}