From 2132fe850322e10313d94d505f7ea268f9524ba0 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 17 Jan 2017 13:08:02 +0100 Subject: fix gdbserver build in nat/linux-ptrace.c on arm-android The following change replaced an include of gregset.h by an include of : commit 39b22471578843019026c50fcdbe0483a6045970 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 if HAVE_SYS_PROCFS_H is defined. Tested by rebuilding gdbserver on arm-android and GNU/Linux. --- gdb/nat/linux-ptrace.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gdb/nat') diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index 3447e07..3265b16 100644 --- a/gdb/nat/linux-ptrace.c +++ b/gdb/nat/linux-ptrace.c @@ -23,7 +23,9 @@ #include "buffer.h" #include "gdb_wait.h" #include "gdb_ptrace.h" +#ifdef HAVE_SYS_PROCFS_H #include +#endif /* Stores the ptrace options supported by the running kernel. A value of -1 means we did not check for features yet. A value -- cgit v1.1