From 7a2813c00be99356b30e568d87a4adaf651de1d8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 3 Sep 2021 10:29:58 -0600 Subject: [PATCH] Use CORE_ADDR as return type from x86_dr_low_get_addr On a Windows build locally, watchpoints started failing. I tracked this down to x86_dr_low_get_addr returning an 'unsigned long'... in this particular build, this is a 32-bit type, but the inferior is a 64-bit program. This patch fixes the problem by changing the return type. No other change is required, because this matches the function pointer in struct x86_dr_low_type. --- gdb/nat/x86-dregs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c index cf8e517eb0d..24751647005 100644 --- a/gdb/nat/x86-dregs.c +++ b/gdb/nat/x86-dregs.c @@ -52,7 +52,7 @@ x86_dr_low_set_addr (struct x86_debug_reg_state *new_state, int i) /* Return the inferior's debug register REGNUM. */ -static unsigned long +static CORE_ADDR x86_dr_low_get_addr (int i) { return x86_dr_low.get_addr (i); -- 2.30.2