From 672f9b600994c1a377477b6d88b7f63aaf9c7ffe Mon Sep 17 00:00:00 2001 From: Kevin Pouget Date: Thu, 15 Sep 2011 12:18:29 +0000 Subject: [PATCH] 2011-09-15 Kevin Pouget * breakpoint.c (describe_other_breakpoints): Do not write 'duplicate' note if the breakpoint is internal. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e0e8866dc17..18af26c3923 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-09-15 Kevin Pouget + + * breakpoint.c (describe_other_breakpoints): Do not write 'duplicate' + note if the breakpoint is internal. + 2011-09-15 Kevin Pouget * MAINTAINERS (Right After Approval): Add myself to the list diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 14c8903aecc..f995b149a90 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5292,7 +5292,7 @@ breakpoint_has_pc (struct breakpoint *b, return 0; } -/* Print a message describing any breakpoints set at PC. This +/* Print a message describing any user-breakpoints set at PC. This concerns with logical breakpoints, so we match program spaces, not address spaces. */ @@ -5305,7 +5305,8 @@ describe_other_breakpoints (struct gdbarch *gdbarch, struct breakpoint *b; ALL_BREAKPOINTS (b) - others += breakpoint_has_pc (b, pspace, pc, section); + others += (user_breakpoint_p (b) + && breakpoint_has_pc (b, pspace, pc, section)); if (others > 0) { if (others == 1) @@ -5313,7 +5314,7 @@ describe_other_breakpoints (struct gdbarch *gdbarch, else /* if (others == ???) */ printf_filtered (_("Note: breakpoints ")); ALL_BREAKPOINTS (b) - if (breakpoint_has_pc (b, pspace, pc, section)) + if (user_breakpoint_p (b) && breakpoint_has_pc (b, pspace, pc, section)) { others--; printf_filtered ("%d", b->number); -- 2.30.2