[binutils-gdb] fix gdbserver build in nat/linux-ptrace.c on arm-android

[Joel Brobecker <brobecke at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2132fe850322e10313d94d505f7ea268f9524ba0

commit 2132fe850322e10313d94d505f7ea268f9524ba0
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Tue Jan 17 13:08:02 2017 +0100

    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 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 <sys/procfs.h> if
            HAVE_SYS_PROCFS_H is defined.
    
    Tested by rebuilding gdbserver on arm-android and GNU/Linux.

Diff:
---
 gdb/ChangeLog          | 5 +++++
 gdb/nat/linux-ptrace.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e1e67d..fd42635 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.
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 <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