diff options
| author | Alan Hayward <alan.hayward@arm.com> | 2019-03-18 16:13:12 +0000 |
|---|---|---|
| committer | Alan Hayward <alan.hayward@arm.com> | 2019-03-19 09:59:55 +0000 |
| commit | 3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae (patch) | |
| tree | a74496c42638d294934f2206fbb03b71c014cb63 /gdb/arm-linux-nat.c | |
| parent | 4faa59bbb7ad8665b6eb7c93bdb726e412850811 (diff) | |
| download | gdb-3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae.zip gdb-3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae.tar.gz gdb-3a0e45b2f187dae8cba444e9b31f05cee0e2d6ae.tar.bz2 | |
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.
Diffstat (limited to 'gdb/arm-linux-nat.c')
| -rw-r--r-- | gdb/arm-linux-nat.c | 14 |
1 files changed, 8 insertions, 6 deletions
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; } |