[binutils-gdb] Fix Arm build error

[Alan Hayward]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae

commit 3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae
Author: Alan Hayward <alan.hayward@arm.com>
Date:   Mon Mar 18 16:13:12 2019 +0000

    Fix Arm build error
    
    The following commit broke the build for Arm:
    d3a70e03cf51c8fb6bc183eaff7559edffec2045
    Change iterate_over_lwps to take a gdb::function_view
    
    Correct the changes made to arm_linux_insert_hw_breakpoint1 and make
    similar changes to arm_linux_remove_hw_breakpoint1.
    
    2019-03-18  Alan Hayward  <alan.hayward@arm.com>
    
    	* arm-linux-nat.c (arm_linux_insert_hw_breakpoint1): Fix
    	variable names.
    	(arm_linux_remove_hw_breakpoint1): Use a gdb::function_view.

Diff:
---
 gdb/ChangeLog       |  6 ++++++
 gdb/arm-linux-nat.c | 14 ++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79376db..7b896ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-18  Alan Hayward  <alan.hayward@arm.com>
+
+	* arm-linux-nat.c (arm_linux_insert_hw_breakpoint1): Fix
+	variable names.
+	(arm_linux_remove_hw_breakpoint1): Use a gdb::function_view.
+
 2019-03-18  Pedro Alves  <palves@redhat.com>
 	    Eli Zaretskii <eliz@gnu.org>
 
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 8c98a71..11e353e 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -1005,8 +1005,8 @@ arm_linux_insert_hw_breakpoint1 (const struct arm_linux_hw_breakpoint* bpt,
         iterate_over_lwps (pid_ptid,
 			   [=] (struct lwp_info *info)
 			   {
-			     return update_registers_callback (info, watch,
-							       index);
+			     return update_registers_callback (info, watchpoint,
+							       i);
 			   });
         break;
       }
@@ -1024,7 +1024,6 @@ arm_linux_remove_hw_breakpoint1 (const struct arm_linux_hw_breakpoint *bpt,
   gdb_byte count, i;
   ptid_t pid_ptid;
   struct arm_linux_hw_breakpoint* bpts;
-  struct update_registers_data data;
 
   pid = inferior_ptid.pid ();
   pid_ptid = ptid_t (pid);
@@ -1043,10 +1042,13 @@ arm_linux_remove_hw_breakpoint1 (const struct arm_linux_hw_breakpoint *bpt,
   for (i = 0; i < count; ++i)
     if (arm_linux_hw_breakpoint_equal (bpt, bpts + i))
       {
-        data.watch = watchpoint;
-        data.index = i;
         bpts[i].control = arm_hwbp_control_disable (bpts[i].control);
-        iterate_over_lwps (pid_ptid, update_registers_callback, &data);
+	iterate_over_lwps (pid_ptid,
+			   [=] (struct lwp_info *info)
+			   {
+			     return update_registers_callback (info, watchpoint,
+							       i);
+			   });
         break;
       }