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

fix gdbserver build in nat/linux-ptrace.c on arm-android 

The following change replaced an include of gregset.h by
an include of <sys/procfs.h>:

    commit 39b2247157
    Date:   Thu Aug 11 12:01:22 2016 +0100
    Subject: Fix fallout from gdb/20413's fix
             (x32: linux_ptrace_test_ret_to_nx: Cannot PTRACE_PEEKUSER)

Unfortunately, this broke gdbserver on Android, because that file
does not exist on this platform.  This patch fixes the issue by
conditionalizing its include with HAVE_SYS_PROCFS_H (which we check
both in gdb/configure and gdbserver/configure).

gdb/ChangeLog:

        * nat/linux-ptrace.c: Only include <sys/procfs.h> if
        HAVE_SYS_PROCFS_H is defined.

Tested by rebuilding gdbserver on arm-android and GNU/Linux.
This commit is contained in:
Joel Brobecker 2017-01-17 13:08:02 +01:00
parent 8b5a555d09
commit 2132fe8503
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-20 Joel Brobecker <brobecker@adacore.com>
* nat/linux-ptrace.c: Only include <sys/procfs.h> if
HAVE_SYS_PROCFS_H is defined.
2017-01-18 Alan Hayward <alan.hayward@arm.com>
* remote.c (struct cached_reg): Change data into a pointer.

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

@ -23,7 +23,9 @@
#include "buffer.h"
#include "gdb_wait.h"
#include "gdb_ptrace.h"
#ifdef HAVE_SYS_PROCFS_H
#include <sys/procfs.h>
#endif
/* Stores the ptrace options supported by the running kernel.
A value of -1 means we did not check for features yet. A value