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

Change function signature passed to clone 

I see the following compile error with an old bfin-uclinux gcc to
build GDBserver,

 cc1: warnings being treated as errors
 gdb/gdbserver/../nat/linux-ptrace.c: In function 'linux_fork_to_function':
 gdb/gdbserver/../nat/linux-ptrace.c:283: error: passing argument 1 of 'clone' from incompatible pointer type

in glibc, clone's prototype is like this, and in uClibc, it is the same,

       int clone(int (*fn)(void *), void *child_stack,
                 int flags, void *arg, ...
                 /* pid_t *ptid, struct user_desc *tls, pid_t *ctid */ );

so this patch changes function signature from 'void (*function) (gdb_byte *)'
to 'int (*function) (void *)'.

Note that I find Pedro advised to change argument type from 'void *'
to 'gdb_byte *' during the patch review
https://sourceware.org/ml/gdb-patches/2013-08/msg00611.html  however,
I think fix compile error can justify the change back to 'void *'.

gdb:

2016-01-12  Yao Qi  <yao.qi@linaro.org>

	* nat/linux-ptrace.c (linux_fork_to_function): Change type
	of argument 'function'.
	(linux_grandchild_function): Change return type to 'int'.
	Change child_stack's type to 'void *'.
	(linux_child_function): Likewise.
This commit is contained in:
Yao Qi 2016-01-12 15:18:09 +00:00
parent bc504a3117
commit ba4dd7c4a1
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2016-01-12 Yao Qi <yao.qi@linaro.org>
* nat/linux-ptrace.c (linux_fork_to_function): Change type
of argument 'function'.
(linux_grandchild_function): Change return type to 'int'.
Change child_stack's type to 'void *'.
(linux_child_function): Likewise.
2016-01-12 Pedro Alves <palves@redhat.com>
Remove use of the registered trademark symbol throughout.

10
gdb/nat/linux-ptrace.c
View File

@ -261,7 +261,7 @@ linux_ptrace_test_ret_to_nx (void)
FUNCTION). For MMU targets, CHILD_STACK is ignored. */
static int
linux_fork_to_function (gdb_byte *child_stack, void (*function) (gdb_byte *))
linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *))
{
int child_pid;
@ -298,8 +298,8 @@ linux_fork_to_function (gdb_byte *child_stack, void (*function) (gdb_byte *))
/* A helper function for linux_check_ptrace_features, called after
the child forks a grandchild. */
static void
linux_grandchild_function (gdb_byte *child_stack)
static int
linux_grandchild_function (void *child_stack)
{
/* Free any allocated stack. */
xfree (child_stack);
@ -313,8 +313,8 @@ linux_grandchild_function (gdb_byte *child_stack)
the parent process forks a child. The child allows itself to
be traced by its parent. */
static void
linux_child_function (gdb_byte *child_stack)
static int
linux_child_function (void *child_stack)
{
ptrace (PTRACE_TRACEME, 0, (PTRACE_TYPE_ARG3) 0, (PTRACE_TYPE_ARG4) 0);
kill (getpid (), SIGSTOP);