[commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Mike Wrighton]

Hi,

I've committed the following patches to fix the hardware breakpoint 
errors bug and add myself to the gdb/MAINTAINERS list (I had to correct 
an error in the gdb/Changelog entry hence 2 patches for that file).

Regards,
Mike

===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- src/gdb/breakpoint.c	2012/08/27 16:55:35	1.702
+++ src/gdb/breakpoint.c	2012/09/12 20:01:10	1.703
@@ -2375,9 +2375,12 @@
  insert_bp_location (struct bp_location *bl,
  		    struct ui_file *tmp_error_stream,
  		    int *disabled_breaks,
-		    int *hw_breakpoint_error)
+		    int *hw_breakpoint_error,
+		    int *hw_bp_error_explained_already)
  {
    int val = 0;
+  char *hw_bp_err_string = NULL;
+  struct gdb_exception e;
  
    if (!should_be_inserted (bl) || (bl->inserted && !bl->needs_update))
      return 0;
@@ -2474,8 +2477,15 @@
  	  || !(section_is_overlay (bl->section)))
  	{
  	  /* No overlay handling: just set the breakpoint.  */
-
-	  val = bl->owner->ops->insert_location (bl);
+	  TRY_CATCH (e, RETURN_MASK_ALL)
+	    {
+	      val = bl->owner->ops->insert_location (bl);
+	    }
+	  if (e.reason < 0)
+	    {
+	      val = 1;
+	      hw_bp_err_string = (char *) e.message;
+	    }
  	}
        else
  	{
@@ -2509,7 +2519,15 @@
  	  if (section_is_mapped (bl->section))
  	    {
  	      /* Yes.  This overlay section is mapped into memory.  */
-	      val = bl->owner->ops->insert_location (bl);
+	      TRY_CATCH (e, RETURN_MASK_ALL)
+	        {
+	          val = bl->owner->ops->insert_location (bl);
+	        }
+	      if (e.reason < 0)
+	        {
+	          val = 1;
+	          hw_bp_err_string = (char *) e.message;
+	        }
  	    }
  	  else
  	    {
@@ -2545,11 +2563,13 @@
  	    {
  	      if (bl->loc_type == bp_loc_hardware_breakpoint)
  		{
-		  *hw_breakpoint_error = 1;
-		  fprintf_unfiltered (tmp_error_stream,
-				      "Cannot insert hardware "
-				      "breakpoint %d.\n",
-				      bl->owner->number);
+                  *hw_breakpoint_error = 1;
+                  *hw_bp_error_explained_already = hw_bp_err_string != NULL;
+                  fprintf_unfiltered (tmp_error_stream,
+                                      "Cannot insert hardware breakpoint %d%s",
+                                      bl->owner->number, hw_bp_err_string ? ":" : ".\n");
+                  if (hw_bp_err_string)
+                    fprintf_unfiltered (tmp_error_stream, "%s.\n", hw_bp_err_string);
  		}
  	      else
  		{
@@ -2741,6 +2761,7 @@
    int val = 0;
    int disabled_breaks = 0;
    int hw_breakpoint_error = 0;
+  int hw_bp_details_reported = 0;
  
    struct ui_file *tmp_error_stream = mem_fileopen ();
    struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_error_stream);
@@ -2775,7 +2796,7 @@
  	continue;
  
        val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks,
-				    &hw_breakpoint_error);
+				    &hw_breakpoint_error, &hw_bp_details_reported);
        if (val)
  	error_flag = val;
      }
@@ -2800,6 +2821,7 @@
    int val = 0;
    int disabled_breaks = 0;
    int hw_breakpoint_error = 0;
+  int hw_bp_error_explained_already = 0;
  
    struct ui_file *tmp_error_stream = mem_fileopen ();
    struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_error_stream);
@@ -2833,7 +2855,7 @@
  	continue;
  
        val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks,
-				    &hw_breakpoint_error);
+				    &hw_breakpoint_error, &hw_bp_error_explained_already);
        if (val)
  	error_flag = val;
      }
@@ -2878,7 +2900,7 @@
      {
        /* If a hardware breakpoint or watchpoint was inserted, add a
           message about possibly exhausted resources.  */
-      if (hw_breakpoint_error)
+      if (hw_breakpoint_error && !hw_bp_error_explained_already)
  	{
  	  fprintf_unfiltered (tmp_error_stream,
  			      "Could not insert hardware breakpoints:\n\
@@ -2943,7 +2965,7 @@
    struct bp_location *bl, **blp_tmp;
    int val;
    struct ui_file *tmp_error_stream;
-  int dummy1 = 0, dummy2 = 0;
+  int dummy1 = 0, dummy2 = 0, dummy3 = 0;
    struct inferior *inf;
    struct thread_info *tp;
  
@@ -2967,7 +2989,7 @@
      if (bl->inserted)
        {
  	bl->inserted = 0;
-	val = insert_bp_location (bl, tmp_error_stream, &dummy1, &dummy2);
+	val = insert_bp_location (bl, tmp_error_stream, &dummy1, &dummy2, &dummy3);
  	if (val != 0)
  	  {
  	    do_cleanups (old_chain);


===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- src/gdb/remote.c	2012/08/28 14:08:41	1.509
+++ src/gdb/remote.c	2012/09/12 20:01:10	1.510
@@ -7026,6 +7026,7 @@
    int ch;
    int tcount = 0;
    char *p;
+  char *message;
  
    /* Catch cases like trying to read memory or listing threads while
       we're waiting for a stop reply.  The remote server wouldn't be
@@ -8181,6 +8182,7 @@
    CORE_ADDR addr;
    struct remote_state *rs;
    char *p, *endbuf;
+  char *message;
  
    /* The length field should be set to the size of a breakpoint
       instruction, even though we aren't inserting one ourselves.  */
@@ -8215,6 +8217,13 @@
    switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z1]))
      {
      case PACKET_ERROR:
+      if (rs->buf[1] == '.')
+        {
+          message = strchr (rs->buf + 2, '.');
+          if (message)
+            error ("Remote failure reply: %s", message + 1);
+        }
+      return -1;
      case PACKET_UNKNOWN:
        return -1;
      case PACKET_OK:

===================================================================
RCS file: /cvs/src/src/gdb/MAINTAINERS,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- src/gdb/MAINTAINERS	2012/08/30 18:59:53	1.490
+++ src/gdb/MAINTAINERS	2012/09/17 14:26:29	1.491
@@ -645,6 +645,7 @@
  Nathan Williams					nathanw@wasabisystems.com
  Bob Wilson					bob.wilson@acm.org
  Jim Wilson					wilson@tuliptree.org
+Mike Wrighton					wrighton@codesourcery.com
  Kwok Cheung Yeung				kcy@codesourcery.com
  Elena Zannoni					elena.zannoni@oracle.com
  Eli Zaretskii					eliz@gnu.org

===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.14670
retrieving revision 1.14671
diff -u -r1.14670 -r1.14671
--- src/gdb/ChangeLog	2012/09/17 18:27:57	1.14670
+++ src/gdb/ChangeLog	2012/09/17 19:16:48	1.14671
@@ -1,3 +1,7 @@
+2012-09-17  Mike Wrighton  <wrighton@codesourcery.com>
+
+	* MAINTAINERS (Write After Approval): Add "Mike Wrighton".
+
  2012-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
  	* common/linux-ptrace.c: Change __i386__ to __i386__ || __x86_64__.
@@ -175,6 +179,7 @@
  	(DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
  	callback typedefs.
  
+>>>>>>> 1.14670
  2012-09-12  Doug Evans  <dje@google.com>
  
  	* dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where


===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.14671
retrieving revision 1.14672
diff -u -r1.14671 -r1.14672
--- src/gdb/ChangeLog	2012/09/17 19:16:48	1.14671
+++ src/gdb/ChangeLog	2012/09/17 19:29:52	1.14672
@@ -179,7 +179,6 @@
  	(DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
  	callback typedefs.
  
->>>>>>> 1.14670
  2012-09-12  Doug Evans  <dje@google.com>
  
  	* dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where

Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Jan Kratochvil]

Hello Mike,

On Mon, 17 Sep 2012 21:59:16 +0200, Mike Wrighton wrote:
> I've committed the following patches to fix the hardware breakpoint
> errors bug and add myself to the gdb/MAINTAINERS list (I had to
> correct an error in the gdb/Changelog entry hence 2 patches for that
> file).

I see now that the real code commit from 12th September
	http://sourceware.org/ml/gdb-cvs/2012-09/msg00052.html

also did not have a ChangeLog entry.  Please add one, to the correct place
chronologically according to the other commits there:
	http://sourceware.org/ml/gdb-cvs/2012-09/


Thanks,
Jan

Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Mike Wrighton]

On 09/17/2012 03:20 PM, Jan Kratochvil wrote:
> Hello Mike,
>
> On Mon, 17 Sep 2012 21:59:16 +0200, Mike Wrighton wrote:
>> I've committed the following patches to fix the hardware breakpoint
>> errors bug and add myself to the gdb/MAINTAINERS list (I had to
>> correct an error in the gdb/Changelog entry hence 2 patches for that
>> file).
> I see now that the real code commit from 12th September
> 	http://sourceware.org/ml/gdb-cvs/2012-09/msg00052.html
>
> also did not have a ChangeLog entry.  Please add one, to the correct place
> chronologically according to the other commits there:
> 	http://sourceware.org/ml/gdb-cvs/2012-09/
>
>
> Thanks,
> Jan

Hi Jan,

Ah yes, I added an entry to the main Changelog rather than the one in 
the gdb subdirectory. I've moved it into the correct place now and 
committed. Let me know if there's anything else I've missed.

Thanks,
Mike


Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/ChangeLog,v
retrieving revision 1.1033
diff -u -p -r1.1033 ChangeLog
--- ChangeLog    15 Sep 2012 17:11:26 -0000    1.1033
+++ ChangeLog    17 Sep 2012 20:35:29 -0000
@@ -13,16 +13,6 @@
      Add libgomp*.o to compare_exclusions for AIX.
      * configure: Regenerate.

-2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
-
-    * gdb/remote.c (remote_insert_hw_breakpoint): Throw exception if
-    there is an error inserting hardware breakpoints and use the
-    error message from the target.
-
-    * gdb/breakpoint.c (insert_bp_location, insert_breakpoint_locations):
-    Catch this exception and print the error message contained within. 
Do not
-    print the default hardware error breakpoint message in this case.
-
  2012-08-26  H.J. Lu  <hongjiu.lu@intel.com>

      PR binutils/4970
Index: gdb/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.14672
diff -u -p -r1.14672 ChangeLog
--- gdb/ChangeLog    17 Sep 2012 19:29:52 -0000    1.14672
+++ gdb/ChangeLog    17 Sep 2012 20:35:30 -0000
@@ -179,6 +179,16 @@
      (DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
      callback typedefs.

+2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
+
+    * remote.c (remote_insert_hw_breakpoint): Throw exception if
+    there is an error inserting hardware breakpoints and use the
+    error message from the target.
+
+    * breakpoint.c (insert_bp_location, insert_breakpoint_locations):
+    Catch this exception and print the error message contained within. 
Do not
+    print the default hardware error breakpoint message in this case.
+
  2012-09-12  Doug Evans  <dje@google.com>

      * dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where

Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Jan Kratochvil]

Hello Mike,

On Mon, 17 Sep 2012 22:42:09 +0200, Mike Wrighton wrote:
> Ah yes, I added an entry to the main Changelog rather than the one
> in the gdb subdirectory. I've moved it into the correct place now
> and committed. Let me know if there's anything else I've missed.

all the formalities seem to be OK now.


Thanks,
Jan

About [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Pierre Muller]

  Hi Mike,

  Calls to warning or error function
have their strings normally enclosed in _()
to allow internationalization.
  This is missing in your patch and generated this automatic email
about ARI regression.
http://sourceware.org/ml/gdb-patches/2012-09/msg00232.html

  Is this intentional,
or should I fix it by committing the patch below?

Pierre Muller
as ARI maintainer

Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.513
diff -u -p -r1.513 remote.c
--- remote.c    2 Nov 2012 18:53:54 -0000       1.513
+++ remote.c    6 Nov 2012 15:39:49 -0000
@@ -8222,7 +8222,7 @@ remote_insert_hw_breakpoint (struct gdba
         {
           message = strchr (rs->buf + 2, '.');
           if (message)
-            error ("Remote failure reply: %s", message + 1);
+            error (_("Remote failure reply: %s"), message + 1);
         }
       return -1;
     case PACKET_UNKNOWN:


> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Mike Wrighton
> Envoyé : lundi 17 septembre 2012 22:42
> À : Jan Kratochvil
> Cc : gdb-patches@sourceware.org
> Objet : Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS
> 
> On 09/17/2012 03:20 PM, Jan Kratochvil wrote:
> > Hello Mike,
> >
> > On Mon, 17 Sep 2012 21:59:16 +0200, Mike Wrighton wrote:
> >> I've committed the following patches to fix the hardware breakpoint
> >> errors bug and add myself to the gdb/MAINTAINERS list (I had to
> >> correct an error in the gdb/Changelog entry hence 2 patches for that
> >> file).
> > I see now that the real code commit from 12th September
> > 	http://sourceware.org/ml/gdb-cvs/2012-09/msg00052.html
> >
> > also did not have a ChangeLog entry.  Please add one, to the correct
place
> > chronologically according to the other commits there:
> > 	http://sourceware.org/ml/gdb-cvs/2012-09/
> >
> >
> > Thanks,
> > Jan
> 
> Hi Jan,
> 
> Ah yes, I added an entry to the main Changelog rather than the one in
> the gdb subdirectory. I've moved it into the correct place now and
> committed. Let me know if there's anything else I've missed.
> 
> Thanks,
> Mike
> 
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/src/src/ChangeLog,v
> retrieving revision 1.1033
> diff -u -p -r1.1033 ChangeLog
> --- ChangeLog    15 Sep 2012 17:11:26 -0000    1.1033
> +++ ChangeLog    17 Sep 2012 20:35:29 -0000
> @@ -13,16 +13,6 @@
>       Add libgomp*.o to compare_exclusions for AIX.
>       * configure: Regenerate.
> 
> -2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
> -
> -    * gdb/remote.c (remote_insert_hw_breakpoint): Throw exception if
> -    there is an error inserting hardware breakpoints and use the
> -    error message from the target.
> -
> -    * gdb/breakpoint.c (insert_bp_location, insert_breakpoint_locations):
> -    Catch this exception and print the error message contained within.
> Do not
> -    print the default hardware error breakpoint message in this case.
> -
>   2012-08-26  H.J. Lu  <hongjiu.lu@intel.com>
> 
>       PR binutils/4970
> Index: gdb/ChangeLog
> ===================================================================
> RCS file: /cvs/src/src/gdb/ChangeLog,v
> retrieving revision 1.14672
> diff -u -p -r1.14672 ChangeLog
> --- gdb/ChangeLog    17 Sep 2012 19:29:52 -0000    1.14672
> +++ gdb/ChangeLog    17 Sep 2012 20:35:30 -0000
> @@ -179,6 +179,16 @@
>       (DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
>       callback typedefs.
> 
> +2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
> +
> +    * remote.c (remote_insert_hw_breakpoint): Throw exception if
> +    there is an error inserting hardware breakpoints and use the
> +    error message from the target.
> +
> +    * breakpoint.c (insert_bp_location, insert_breakpoint_locations):
> +    Catch this exception and print the error message contained within.
> Do not
> +    print the default hardware error breakpoint message in this case.
> +
>   2012-09-12  Doug Evans  <dje@google.com>
> 
>       * dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where
> 

Re: About [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Mike Wrighton]

Hi Pierre,

Nope this was not intentional - feel free to go ahead with the patch.

Thanks,
Mike

On 11/06/2012 10:47 AM, Pierre Muller wrote:
>    Hi Mike,
>
>    Calls to warning or error function
> have their strings normally enclosed in _()
> to allow internationalization.
>    This is missing in your patch and generated this automatic email
> about ARI regression.
> http://sourceware.org/ml/gdb-patches/2012-09/msg00232.html
>
>    Is this intentional,
> or should I fix it by committing the patch below?
>
> Pierre Muller
> as ARI maintainer
>
> Index: remote.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/remote.c,v
> retrieving revision 1.513
> diff -u -p -r1.513 remote.c
> --- remote.c    2 Nov 2012 18:53:54 -0000       1.513
> +++ remote.c    6 Nov 2012 15:39:49 -0000
> @@ -8222,7 +8222,7 @@ remote_insert_hw_breakpoint (struct gdba
>           {
>             message = strchr (rs->buf + 2, '.');
>             if (message)
> -            error ("Remote failure reply: %s", message + 1);
> +            error (_("Remote failure reply: %s"), message + 1);
>           }
>         return -1;
>       case PACKET_UNKNOWN:
>
>
>> -----Message d'origine-----
>> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
>> owner@sourceware.org] De la part de Mike Wrighton
>> Envoyé : lundi 17 septembre 2012 22:42
>> À : Jan Kratochvil
>> Cc : gdb-patches@sourceware.org
>> Objet : Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS
>>
>> On 09/17/2012 03:20 PM, Jan Kratochvil wrote:
>>> Hello Mike,
>>>
>>> On Mon, 17 Sep 2012 21:59:16 +0200, Mike Wrighton wrote:
>>>> I've committed the following patches to fix the hardware breakpoint
>>>> errors bug and add myself to the gdb/MAINTAINERS list (I had to
>>>> correct an error in the gdb/Changelog entry hence 2 patches for that
>>>> file).
>>> I see now that the real code commit from 12th September
>>> 	http://sourceware.org/ml/gdb-cvs/2012-09/msg00052.html
>>>
>>> also did not have a ChangeLog entry.  Please add one, to the correct
> place
>>> chronologically according to the other commits there:
>>> 	http://sourceware.org/ml/gdb-cvs/2012-09/
>>>
>>>
>>> Thanks,
>>> Jan
>> Hi Jan,
>>
>> Ah yes, I added an entry to the main Changelog rather than the one in
>> the gdb subdirectory. I've moved it into the correct place now and
>> committed. Let me know if there's anything else I've missed.
>>
>> Thanks,
>> Mike
>>
>>
>> Index: ChangeLog
>> ===================================================================
>> RCS file: /cvs/src/src/ChangeLog,v
>> retrieving revision 1.1033
>> diff -u -p -r1.1033 ChangeLog
>> --- ChangeLog    15 Sep 2012 17:11:26 -0000    1.1033
>> +++ ChangeLog    17 Sep 2012 20:35:29 -0000
>> @@ -13,16 +13,6 @@
>>        Add libgomp*.o to compare_exclusions for AIX.
>>        * configure: Regenerate.
>>
>> -2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
>> -
>> -    * gdb/remote.c (remote_insert_hw_breakpoint): Throw exception if
>> -    there is an error inserting hardware breakpoints and use the
>> -    error message from the target.
>> -
>> -    * gdb/breakpoint.c (insert_bp_location, insert_breakpoint_locations):
>> -    Catch this exception and print the error message contained within.
>> Do not
>> -    print the default hardware error breakpoint message in this case.
>> -
>>    2012-08-26  H.J. Lu  <hongjiu.lu@intel.com>
>>
>>        PR binutils/4970
>> Index: gdb/ChangeLog
>> ===================================================================
>> RCS file: /cvs/src/src/gdb/ChangeLog,v
>> retrieving revision 1.14672
>> diff -u -p -r1.14672 ChangeLog
>> --- gdb/ChangeLog    17 Sep 2012 19:29:52 -0000    1.14672
>> +++ gdb/ChangeLog    17 Sep 2012 20:35:30 -0000
>> @@ -179,6 +179,16 @@
>>        (DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
>>        callback typedefs.
>>
>> +2012-09-12  Mike Wrighton  <wrighton@codesourcery.com>
>> +
>> +    * remote.c (remote_insert_hw_breakpoint): Throw exception if
>> +    there is an error inserting hardware breakpoints and use the
>> +    error message from the target.
>> +
>> +    * breakpoint.c (insert_bp_location, insert_breakpoint_locations):
>> +    Catch this exception and print the error message contained within.
>> Do not
>> +    print the default hardware error breakpoint message in this case.
>> +
>>    2012-09-12  Doug Evans  <dje@google.com>
>>
>>        * dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where
>>
>

[PATCH/OBV] ARI markup fix (was [commit] Hardware breakpoint errors patch)

[Pierre Muller]

Thus committed under obviouss rule in

http://sourceware.org/ml/gdb-cvs/2012-11/msg00041.html


Pierre Muller

> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Mike Wrighton
> Envoyé : mardi 6 novembre 2012 16:52
> À : Pierre Muller
> Cc : gdb-patches@sourceware.org
> Objet : Re: About [commit] Hardware breakpoint errors patch,
gdb/MAINTAINERS
> 
> Hi Pierre,
> 
> Nope this was not intentional - feel free to go ahead with the patch.
> 
> Thanks,
> Mike

Re: About [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Tom Tromey]

>>>>> "Pierre" == Pierre Muller <pierre.muller@ics-cnrs.unistra.fr> writes:

Pierre>   Is this intentional,
Pierre> or should I fix it by committing the patch below?

Please put it in, thanks.

Tom

Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

[Tom Tromey]

>>>>> "Mike" == Mike Wrighton <mike_wrighton@mentor.com> writes:

Mike> I've committed the following patches to fix the hardware breakpoint
Mike> errors bug and add myself to the gdb/MAINTAINERS list (I had to
Mike> correct an error in the gdb/Changelog entry hence 2 patches for that
Mike> file).

Mike> diff -u -r1.14670 -r1.14671
Mike> --- src/gdb/ChangeLog	2012/09/17 18:27:57	1.14670
Mike> +++ src/gdb/ChangeLog	2012/09/17 19:16:48	1.14671
[...]
Mike>  +>>>>>>> 1.14670

Forgotten conflict marker.

Tom