aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2015-11-03 13:33:13 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2015-11-03 13:33:13 -0500
commit171de4b8fb2bfe1be8a2f7f479047e51da05883e (patch)
tree6584abae92e5c715c513a0502820552473881b86
parent04248ead1f57204119180022580626e31c165f60 (diff)
downloadgdb-171de4b8fb2bfe1be8a2f7f479047e51da05883e.zip
gdb-171de4b8fb2bfe1be8a2f7f479047e51da05883e.tar.gz
gdb-171de4b8fb2bfe1be8a2f7f479047e51da05883e.tar.bz2
Change return type of raw_bkpt_type_to_arm_hwbp_type
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.
-rw-r--r--gdb/gdbserver/ChangeLog5
-rw-r--r--gdb/gdbserver/linux-arm-low.c2
2 files changed, 6 insertions, 1 deletions
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 <simon.marchi@polymtl.ca>
+ * linux-arm-low.c (raw_bkpt_type_to_arm_hwbp_type):
+ Change return type to arm_hwbp_type.
+
+2015-11-03 Simon Marchi <simon.marchi@polymtl.ca>
+
* 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)