From 04248ead1f57204119180022580626e31c165f60 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 3 Nov 2015 13:33:13 -0500 Subject: [PATCH] gdbserver arm: Add casts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Trivial casts for C++. Fixes things like In file included from /home/simark/src/binutils-gdb/gdb/gdbserver/../common/common-defs.h:39:0, from /home/simark/src/binutils-gdb/gdb/gdbserver/server.h:22, from /home/simark/src/binutils-gdb/gdb/gdbserver/linux-arm-low.c:19: /home/simark/src/binutils-gdb/gdb/gdbserver/linux-arm-low.c: In function ‘int arm_get_hwcap(long unsigned int*)’: /home/simark/src/binutils-gdb/gdb/gdbserver/../../include/libiberty.h:711:38: error: invalid conversion from ‘void*’ to ‘unsigned char*’ [-fpermissive] # define alloca(x) __builtin_alloca(x) ^ /home/simark/src/binutils-gdb/gdb/gdbserver/linux-arm-low.c:807:25: note: in expansion of macro ‘alloca’ unsigned char *data = alloca (8); ^ gdb/gdbserver/ChangeLog: * linux-aarch32-low.c (arm_fill_gregset): Add cast. (arm_store_gregset): Likewise. * linux-arm-low.c (arm_get_hwcap): Likewise. (arm_read_description): Likewise. --- gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/linux-aarch32-low.c | 4 ++-- gdb/gdbserver/linux-arm-low.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index ff0af3a4517..2906cc05411 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +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. + (arm_read_description): Likewise. + 2015-11-03 Simon Marchi * linux-aarch32-low.c (aarch32_regsets): Use NULL_REGSET. diff --git a/gdb/gdbserver/linux-aarch32-low.c b/gdb/gdbserver/linux-aarch32-low.c index 891f8cd4592..221b5b99704 100644 --- a/gdb/gdbserver/linux-aarch32-low.c +++ b/gdb/gdbserver/linux-aarch32-low.c @@ -39,7 +39,7 @@ void arm_fill_gregset (struct regcache *regcache, void *buf) { int i; - uint32_t *regs = buf; + uint32_t *regs = (uint32_t *) buf; for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++) collect_register (regcache, i, ®s[i]); @@ -54,7 +54,7 @@ arm_store_gregset (struct regcache *regcache, const void *buf) { int i; char zerobuf[8]; - const uint32_t *regs = buf; + const uint32_t *regs = (const uint32_t *) buf; memset (zerobuf, 0, 8); for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++) diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index e10955f5c23..ae659dd8344 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -804,7 +804,7 @@ arm_prepare_to_resume (struct lwp_info *lwp) static int arm_get_hwcap (unsigned long *valp) { - unsigned char *data = alloca (8); + unsigned char *data = (unsigned char *) alloca (8); int offset = 0; while ((*the_target->read_auxv) (offset, data, 8) == 8) @@ -855,7 +855,7 @@ arm_read_description (void) /* Now make sure that the kernel supports reading these registers. Support was added in 2.6.30. */ errno = 0; - buf = xmalloc (32 * 8 + 4); + buf = (char *) xmalloc (32 * 8 + 4); if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0 && errno == EIO) result = tdesc_arm; -- 2.30.2