From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21896 invoked by alias); 17 Apr 2008 22:45:10 -0000 Received: (qmail 21885 invoked by uid 22791); 17 Apr 2008 22:45:09 -0000 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 17 Apr 2008 22:44:51 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DA3482AA554 for ; Thu, 17 Apr 2008 18:44:49 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 0nmM0Y734JF9 for ; Thu, 17 Apr 2008 18:44:49 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id A13CE2AA507 for ; Thu, 17 Apr 2008 18:44:49 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 98090E7ACD; Thu, 17 Apr 2008 15:44:47 -0700 (PDT) Date: Thu, 17 Apr 2008 23:08:00 -0000 From: Joel Brobecker To: gdb-patches@sources.redhat.com Subject: [commit] print breakpoint address only once (branch?) Message-ID: <20080417224447.GG12735@adacore.com> References: <200804151434.57665.vladimir@codesourcery.com> <20080417025749.GA18352@caradoc.them.org> <200804171359.09556.vladimir@codesourcery.com> <20080417174642.GO17488@caradoc.them.org> <20080417211542.GC12735@adacore.com> <20080417212523.GA7870@caradoc.them.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq" Content-Disposition: inline In-Reply-To: <20080417212523.GA7870@caradoc.them.org> User-Agent: Mutt/1.4.2.2i Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-04/txt/msg00376.txt.bz2 --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 364 > > Let me know if you'd like me to fix this. > > Yes please. Ok, fixed thusly: 2008-04-17 Joel Brobecker * breakpoint.c (print_one_breakpoint_location): Make sure to print the breakpoint address only once. Tested on x86-linux, no regression. I think this should probably go in 6.8 as well. Any objection? -- Joel --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="bp.diff" Content-length: 694 Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.308 diff -u -p -r1.308 breakpoint.c --- breakpoint.c 15 Apr 2008 14:32:12 -0000 1.308 +++ breakpoint.c 17 Apr 2008 22:41:53 -0000 @@ -3607,7 +3607,7 @@ print_one_breakpoint_location (struct br annotate_field (4); if (header_of_multiple) ui_out_field_string (uiout, "addr", ""); - if (b->loc == NULL || loc->shlib_disabled) + else if (b->loc == NULL || loc->shlib_disabled) ui_out_field_string (uiout, "addr", ""); else ui_out_field_core_addr (uiout, "addr", loc->address); --45Z9DzgjV8m4Oswq--