OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS ptrace build fixes 

Since Pedro's ptrace cleanups, the MIPS buildbot compilation fails.
Code in MIPS native uses ptrace with 3 arguments, where ptrace requires
4.  When looking at the definition of ptrace in
/usr/include/sys/ptrace.h, it shows that it takes a variable number of
arguments.  The wrapper macro in nat/gdb_ptrace.h takes a fixed number
of arguments (4).  That would explain why it used to work and stopped.

I am pushing this as obvious, tell me if there is any problem.

I built-tested this with a MIPS toolchain (ct-ng), but I don't have any
setup to test it.  At least it should put back the buildbot builder in a
better shape.

gdb/ChangeLog:

	* mips-linux-nat.c (write_watchpoint_regs): Add NULL as ptrace's 4th
	parameter.
	(mips_linux_new_thread): Likewise.
	* nat/mips-linux-watch.c (mips_linux_read_watch_registers): Likewise.

gdb/gdbserver/ChangeLog:

	* linux-mips-low.c (mips_linux_prepare_to_resume): Add NULL as
	ptrace's 4th parameter.
This commit is contained in:
Simon Marchi 2015-07-29 17:15:46 -04:00
parent d618e4c51c
commit aa58a496ed
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2015-07-29 Simon Marchi <simon.marchi@ericsson.com>
* mips-linux-nat.c (write_watchpoint_regs): Add NULL as ptrace's 4th
parameter.
(mips_linux_new_thread): Likewise.
* nat/mips-linux-watch.c (mips_linux_read_watch_registers): Likewise.
2015-07-29 Patrick Palka <patrick@parcs.ath.cx>
* top.c: Include "tui/tui.h".

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-29 Simon Marchi <simon.marchi@ericsson.com>
* linux-mips-low.c (mips_linux_prepare_to_resume): Add NULL as
ptrace's 4th parameter.
2015-07-27 Yao Qi <yao.qi@linaro.org>
* configure.srv (case aarch64*-*-linux*): Don't set

2
gdb/gdbserver/linux-mips-low.c
View File

@ -427,7 +427,7 @@ mips_linux_prepare_to_resume (struct lwp_info *lwp)
int tid = ptid_get_lwp (ptid);
if (-1 == ptrace (PTRACE_SET_WATCH_REGS, tid,
&priv->watch_mirror))
&priv->watch_mirror, NULL))
perror_with_name ("Couldn't write watch register");
}

4
gdb/mips-linux-nat.c
View File

@ -614,7 +614,7 @@ write_watchpoint_regs (void)
ALL_LWPS (lp)
{
tid = ptid_get_lwp (lp->ptid);
if (ptrace (PTRACE_SET_WATCH_REGS, tid, &watch_mirror) == -1)
if (ptrace (PTRACE_SET_WATCH_REGS, tid, &watch_mirror, NULL) == -1)
perror_with_name (_("Couldn't write debug register"));
}
return 0;
@ -634,7 +634,7 @@ mips_linux_new_thread (struct lwp_info *lp)
return;
tid = ptid_get_lwp (lp->ptid);
if (ptrace (PTRACE_SET_WATCH_REGS, tid, &watch_mirror) == -1)
if (ptrace (PTRACE_SET_WATCH_REGS, tid, &watch_mirror, NULL) == -1)
perror_with_name (_("Couldn't write debug register"));
}

2
gdb/nat/mips-linux-watch.c
View File

@ -164,7 +164,7 @@ mips_linux_read_watch_registers (long lwpid,
{
if (force || *watch_readback_valid == 0)
{
if (ptrace (PTRACE_GET_WATCH_REGS, lwpid, watch_readback) == -1)
if (ptrace (PTRACE_GET_WATCH_REGS, lwpid, watch_readback, NULL) == -1)
{
*watch_readback_valid = -1;
return 0;