From 2583da7cd64e680e43cf92c8022eadee84357b3b Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 21 Jul 2016 14:34:07 +0100 Subject: [PATCH] Fix cast to 'gdb_breakpoint *' c-mode buildbot catches a build problem, gcc -g -O2 -I. -I../../../binutils-gdb/gdb/gdbserver -I../../../binutils-gdb/gdb/gdbserver/../common -I../../../binutils-gdb/gdb/gdbserver/../regformats -I../../../binutils-gdb/gdb/gdbserver/.. -I../../../binutils-gdb/gdb/gdbserver/../../include -I../../../binutils-gdb/gdb/gdbserver/../gnulib/import -Ibuild-gnulib-gdbserver/import -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wpointer-sign -Wmissing-prototypes -Wdeclaration-after-statement -Wmissing-parameter-type -Wold-style-declaration -Wold-style-definition -Wformat-nonliteral -Wno-missing-prototypes -Werror -DGDBSERVER -c -o hostio.o -MT hostio.o -MMD -MP -MF .deps/hostio.Tpo ../../../binutils-gdb/gdb/gdbserver/hostio.c ../../../binutils-gdb/gdb/gdbserver/mem-break.c: In function find_gdb_breakpoint: ../../../binutils-gdb/gdb/gdbserver/mem-break.c:996:15: error: gdb_breakpoint undeclared (first use in this function) return (gdb_breakpoint *) bp; we should use 'struct gdb_breakpoint' rather than 'gdb_breakpoint'. Patch below fixes this. gdb/gdbserver: 2016-07-21 Yao Qi * mem-break.c (find_gdb_breakpoint): Cast bp to 'struct gdb_breakpoint *' rather than 'gdb_breakpoint *'. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/mem-break.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 1592a11c52..41567905a8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2016-07-21 Yao Qi + + * mem-break.c (find_gdb_breakpoint): Cast bp to + 'struct gdb_breakpoint *' rather than 'gdb_breakpoint *'. + 2016-07-21 Yao Qi * server.c (handle_v_requests): Support s and S actions diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c index 65ca3f9d3e..7cd037f89a 100644 --- a/gdb/gdbserver/mem-break.c +++ b/gdb/gdbserver/mem-break.c @@ -996,7 +996,7 @@ find_gdb_breakpoint (char z_type, CORE_ADDR addr, int kind) for (bp = proc->breakpoints; bp != NULL; bp = bp->next) if (bp->type == type && bp->raw->pc == addr && (kind == -1 || bp->raw->kind == kind)) - return (gdb_breakpoint *) bp; + return (struct gdb_breakpoint *) bp; return NULL; }