From 4a8a7965f233f571b78f7992292a31c990c15a5e Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 25 Aug 2015 11:38:29 +0100 Subject: [PATCH] Make aarch64_notify_debug_reg_change the same on GDB and GDBserver gdb: 2015-08-25 Yao Qi * aarch64-linux-nat.c (aarch64_notify_debug_reg_change): Call current_lwp_ptid. gdb/gdbserver: 2015-08-25 Yao Qi * linux-aarch64-low.c (aarch64_notify_debug_reg_change): Call current_lwp_ptid. --- gdb/ChangeLog | 5 +++++ gdb/aarch64-linux-nat.c | 2 +- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-aarch64-low.c | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aa33c81b0ae..06d741135b3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-08-25 Yao Qi + + * aarch64-linux-nat.c (aarch64_notify_debug_reg_change): + Call current_lwp_ptid. + 2015-08-25 Yao Qi * aarch64-linux-nat.c (debug_reg_change_callback): Use diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 3721feac067..867f8c4007d 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -224,7 +224,7 @@ aarch64_notify_debug_reg_change (const struct aarch64_debug_reg_state *state, int is_watchpoint, unsigned int idx) { struct aarch64_dr_update_callback_param param; - ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); + ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ())); param.is_watchpoint = is_watchpoint; param.idx = idx; diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2a7dc0b2ebe..df5b914d68c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-08-25 Yao Qi + + * linux-aarch64-low.c (aarch64_notify_debug_reg_change): + Call current_lwp_ptid. + 2015-08-25 Yao Qi * linux-aarch64-low.c (debug_reg_change_callback): Use diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 0ca2b0b25fb..bfff7e4a887 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -307,7 +307,7 @@ aarch64_notify_debug_reg_change (const struct aarch64_debug_reg_state *state, int is_watchpoint, unsigned int idx) { struct aarch64_dr_update_callback_param param; - ptid_t pid_ptid = pid_to_ptid (pid_of (current_thread)); + ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ())); param.is_watchpoint = is_watchpoint; param.idx = idx; -- 2.30.2