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 916bc3f740c8a47eefb7a2bca3b225c0b791043b..8b1c298f51672a82724f1079a619e6384449b603 100644 (file)
--- 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 01a46b39f41973790188e1524de6e804d1e09c53..933d90226dd69d8757adeea851706dca257f8303 100644 (file)
--- 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);
       }