From: Pedro Alves <palves@redhat.com>
Date: Mon, 5 Dec 2011 16:57:30 +0000 (+0000)
Subject: 	* breakpoint.c: Include record.h.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=049e32d3aafe865eb23109d4119702da07251ef2;p=deliverable%2Fbinutils-gdb.git

	* breakpoint.c: Include record.h.
	(breakpoints_always_inserted_mode): Return false when the record
	target is in use.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 262ca616f9..5b8691cb42 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-05  Pedro Alves  <pedro@codesourcery.com>
+
+	* breakpoint.c: Include record.h.
+	(breakpoints_always_inserted_mode): Return false when the record
+	target is in use.
+
 2011-12-05  Pedro Alves  <pedro@codesourcery.com>
 
 	* amd64-linux-nat.c (amd64_linux_dr_get): Remove FIXME comment.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c6b8e05baa..6f8fd2120d 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -67,6 +67,7 @@
 #include "continuations.h"
 #include "stack.h"
 #include "skip.h"
+#include "record.h"
 
 /* readline include files */
 #include "readline/readline.h"
@@ -377,8 +378,9 @@ show_always_inserted_mode (struct ui_file *file, int from_tty,
 int
 breakpoints_always_inserted_mode (void)
 {
-  return (always_inserted_mode == always_inserted_on
-	  || (always_inserted_mode == always_inserted_auto && non_stop));
+  return ((always_inserted_mode == always_inserted_on
+	   || (always_inserted_mode == always_inserted_auto && non_stop))
+	  && !RECORD_IS_USED);
 }
 
 void _initialize_breakpoint (void);