This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] [spu] Fix C++ build problems
- From: Ulrich Weigand <uweigand at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 4 May 2016 23:44:17 -0000
- Subject: [binutils-gdb] [spu] Fix C++ build problems
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c1aebf87fd3887ae02e5e62fb41889c9fa37a8a9
commit c1aebf87fd3887ae02e5e62fb41889c9fa37a8a9
Author: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Wed May 4 19:42:09 2016 -0400
[spu] Fix C++ build problems
ChangeLog:
* spu-linux-nat.c (spu_bfd_iovec_pread): Add pointer cast for C++.
(spu_bfd_open): Likewise.
gdbserver/ChangeLog:
* spu-low.c (fetch_ppc_register): Cast PowerPC-Linux-specific value
used as first ptrace argument to PTRACE_TYPE_ARG1 for C++.
(fetch_ppc_memory_1, store_ppc_memory_1): Likewise.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/gdbserver/ChangeLog | 6 ++++++
gdb/gdbserver/spu-low.c | 10 ++++++----
gdb/spu-linux-nat.c | 4 ++--
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f1b4a4..2afa2f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-04 Ulrich Weigand <uweigand@de.ibm.com>
+
+ * spu-linux-nat.c (spu_bfd_iovec_pread): Add pointer cast for C++.
+ (spu_bfd_open): Likewise.
+
2016-05-04 Yao Qi <yao.qi@linaro.org>
PR gdb/19947
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a0c90ee..b674832 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-04 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
+
+ * spu-low.c (fetch_ppc_register): Cast PowerPC-Linux-specific value
+ used as first ptrace argument to PTRACE_TYPE_ARG1 for C++.
+ (fetch_ppc_memory_1, store_ppc_memory_1): Likewise.
+
2016-04-28 Par Olsson <par.olsson@windriver.com>
2016-04-28 Simon Marchi <simon.marchi@ericsson.com>
diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c
index 5b54546..32e7c72 100644
--- a/gdb/gdbserver/spu-low.c
+++ b/gdb/gdbserver/spu-low.c
@@ -76,10 +76,10 @@ fetch_ppc_register (int regno)
char buf[8];
errno = 0;
- ptrace (PPC_PTRACE_PEEKUSR_3264, tid,
+ ptrace ((PTRACE_TYPE_ARG1) PPC_PTRACE_PEEKUSR_3264, tid,
(PTRACE_TYPE_ARG3) (regno * 8), buf);
if (errno == 0)
- ptrace (PPC_PTRACE_PEEKUSR_3264, tid,
+ ptrace ((PTRACE_TYPE_ARG1) PPC_PTRACE_PEEKUSR_3264, tid,
(PTRACE_TYPE_ARG3) (regno * 8 + 4), buf + 4);
if (errno == 0)
return (CORE_ADDR) *(unsigned long long *)buf;
@@ -109,7 +109,8 @@ fetch_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET *word)
if (memaddr >> 32)
{
unsigned long long addr_8 = (unsigned long long) memaddr;
- ptrace (PPC_PTRACE_PEEKTEXT_3264, tid, (PTRACE_TYPE_ARG3) &addr_8, word);
+ ptrace ((PTRACE_TYPE_ARG1) PPC_PTRACE_PEEKTEXT_3264, tid,
+ (PTRACE_TYPE_ARG3) &addr_8, word);
}
else
#endif
@@ -128,7 +129,8 @@ store_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET word)
if (memaddr >> 32)
{
unsigned long long addr_8 = (unsigned long long) memaddr;
- ptrace (PPC_PTRACE_POKEDATA_3264, tid, (PTRACE_TYPE_ARG3) &addr_8, word);
+ ptrace ((PTRACE_TYPE_ARG1) PPC_PTRACE_POKEDATA_3264, tid,
+ (PTRACE_TYPE_ARG3) &addr_8, word);
}
else
#endif
diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index 8d4dee3..f1d58ec 100644
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -296,7 +296,7 @@ spu_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf,
{
ULONGEST addr = *(ULONGEST *)stream;
- if (fetch_ppc_memory (addr + offset, buf, nbytes) != 0)
+ if (fetch_ppc_memory (addr + offset, (gdb_byte *)buf, nbytes) != 0)
{
bfd_set_error (bfd_error_invalid_operation);
return -1;
@@ -347,7 +347,7 @@ spu_bfd_open (ULONGEST addr)
int sect_size = bfd_section_size (nbfd, spu_name);
if (sect_size > 20)
{
- char *buf = alloca (sect_size - 20 + 1);
+ char *buf = (char *)alloca (sect_size - 20 + 1);
bfd_get_section_contents (nbfd, spu_name, buf, 20, sect_size - 20);
buf[sect_size - 20] = '\0';