From: Andrew Cagney <cagney@redhat.com>
Date: Sat, 12 Jun 2004 17:58:23 +0000 (+0000)
Subject: 2004-06-12  Andrew Cagney  <cagney@gnu.org>
X-Git-Tag: gdb_6_1_1-20040616-release~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ba8673055fbd4326d82aa119b0a39cbe220feb1;p=thirdparty%2Fbinutils-gdb.git

2004-06-12  Andrew Cagney  <cagney@gnu.org>

	Import from mainline:
	2004-05-05  Jim Ingham  <jingham@apple.com>
	* breakpoint.c (create_breakpoints): Copy the ignore count and
	thread id over from the pended breakpoint to the actual
	breakpoint.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 916bc3f740c..8b1c298f516 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-12  Andrew Cagney  <cagney@gnu.org>
+
+	Import from mainline:
+	2004-05-05  Jim Ingham  <jingham@apple.com>
+	* breakpoint.c (create_breakpoints): Copy the ignore count and
+	thread id over from the pended breakpoint to the actual
+	breakpoint.
+	
 2004-06-11  Andrew Cagney  <cagney@gnu.org>
 
 	* NEWS: Mention ISO-C fixes.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 01a46b39f41..933d90226dd 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4921,6 +4921,10 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
 	       be copied too.  */
 	    if (pending_bp->commands)
 	      b->commands = copy_command_lines (pending_bp->commands);
+	    
+	    /* We have to copy over the ignore_count and thread as well.  */
+	    b->ignore_count = pending_bp->ignore_count;
+	    b->thread = pending_bp->thread;
 	  }
 	mention (b);
       }