Skip to content
Snippets Groups Projects
Commit c1aebf87 authored by Ulrich Weigand's avatar Ulrich Weigand
Browse files

[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.
parent c3fbf828
No related branches found
No related tags found
No related merge requests found
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> 2016-05-04 Yao Qi <yao.qi@linaro.org>
PR gdb/19947 PR gdb/19947
......
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 Par Olsson <par.olsson@windriver.com>
2016-04-28 Simon Marchi <simon.marchi@ericsson.com> 2016-04-28 Simon Marchi <simon.marchi@ericsson.com>
......
...@@ -76,10 +76,10 @@ fetch_ppc_register (int regno) ...@@ -76,10 +76,10 @@ fetch_ppc_register (int regno)
char buf[8]; char buf[8];
errno = 0; errno = 0;
ptrace (PPC_PTRACE_PEEKUSR_3264, tid, ptrace ((PTRACE_TYPE_ARG1) PPC_PTRACE_PEEKUSR_3264, tid,
(PTRACE_TYPE_ARG3) (regno * 8), buf); (PTRACE_TYPE_ARG3) (regno * 8), buf);
if (errno == 0) 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); (PTRACE_TYPE_ARG3) (regno * 8 + 4), buf + 4);
if (errno == 0) if (errno == 0)
return (CORE_ADDR) *(unsigned long long *)buf; return (CORE_ADDR) *(unsigned long long *)buf;
...@@ -109,7 +109,8 @@ fetch_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET *word) ...@@ -109,7 +109,8 @@ fetch_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET *word)
if (memaddr >> 32) if (memaddr >> 32)
{ {
unsigned long long addr_8 = (unsigned long long) memaddr; 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 else
#endif #endif
...@@ -128,7 +129,8 @@ store_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET word) ...@@ -128,7 +129,8 @@ store_ppc_memory_1 (int tid, CORE_ADDR memaddr, PTRACE_TYPE_RET word)
if (memaddr >> 32) if (memaddr >> 32)
{ {
unsigned long long addr_8 = (unsigned long long) memaddr; 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 else
#endif #endif
......
...@@ -296,7 +296,7 @@ spu_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf, ...@@ -296,7 +296,7 @@ spu_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf,
{ {
ULONGEST addr = *(ULONGEST *)stream; 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); bfd_set_error (bfd_error_invalid_operation);
return -1; return -1;
...@@ -347,7 +347,7 @@ spu_bfd_open (ULONGEST addr) ...@@ -347,7 +347,7 @@ spu_bfd_open (ULONGEST addr)
int sect_size = bfd_section_size (nbfd, spu_name); int sect_size = bfd_section_size (nbfd, spu_name);
if (sect_size > 20) 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); bfd_get_section_contents (nbfd, spu_name, buf, 20, sect_size - 20);
buf[sect_size - 20] = '\0'; buf[sect_size - 20] = '\0';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment