From 171de4b8fb2bfe1be8a2f7f479047e51da05883e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 3 Nov 2015 13:33:13 -0500 Subject: [PATCH] Change return type of raw_bkpt_type_to_arm_hwbp_type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: /home/simark/src/binutils-gdb/gdb/gdbserver/linux-arm-low.c: In function ‘int arm_linux_hw_point_initialize(raw_bkpt_type, CORE_ADDR, int, arm_linux_hw_breakpoint*)’: /home/simark/src/binutils-gdb/gdb/gdbserver/linux-arm-low.c:459:55: error: invalid conversion from ‘int’ to ‘arm_hwbp_type’ [-fpermissive] hwbp_type = raw_bkpt_type_to_arm_hwbp_type (raw_type); ^ gdb/gdbserver/ChangeLog: * linux-arm-low.c (raw_bkpt_type_to_arm_hwbp_type): Change return type to arm_hwbp_type. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-arm-low.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2906cc0..8fe643c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2015-11-03 Simon Marchi + * linux-arm-low.c (raw_bkpt_type_to_arm_hwbp_type): + Change return type to arm_hwbp_type. + +2015-11-03 Simon Marchi + * linux-aarch32-low.c (arm_fill_gregset): Add cast. (arm_store_gregset): Likewise. * linux-arm-low.c (arm_get_hwcap): Likewise. diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index ae659dd..dda37cb 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -426,7 +426,7 @@ arm_linux_hw_breakpoint_equal (const struct arm_linux_hw_breakpoint *p1, /* Convert a raw breakpoint type to an enum arm_hwbp_type. */ -static int +static arm_hwbp_type raw_bkpt_type_to_arm_hwbp_type (enum raw_bkpt_type raw_type) { switch (raw_type) -- 2.7.4