This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb/gdb-7.12-branch] Fix fallout from gdb/20413's fix (x32: linux_ptrace_test_ret_to_nx: Cannot PTRACE_PEEKUSER)


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

commit e565c44e294111fdc2b84396917b0c4ffed916fb
Author: Pedro Alves <palves@redhat.com>
Date:   Thu Aug 11 12:03:18 2016 +0100

    Fix fallout from gdb/20413's fix (x32: linux_ptrace_test_ret_to_nx: Cannot PTRACE_PEEKUSER)
    
    Fixes, on NIOS GNU/Linux:
    
      In file included from
      /scratch/mbilal/nois-lite/src/gdb-trunk/gdb/gdbserver/../nat/linux-ptrace.c:26:0:
      /scratch/mbilal/nois-lite/src/gdb-trunk/gdb/gdbserver/../gregset.h:27:23:
      error: unknown type name 'gregset_t'
       #define GDB_GREGSET_T gregset_t
    			 ^
    
    Fix this by including sys/procfs.h directly.  We shouldn't really be
    including a gdb-only header in a gdb/nat/ file, anyway.  Whoops.
    
    gdb/ChangeLog:
    2016-08-11  Pedro Alves  <palves@redhat.com>
    
    	PR gdb/20413
    	* nat/linux-ptrace.c: Include <sys/procfs.h> instead of
    	"gregset.h".

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 61cc8c1..0f08ec0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-11  Pedro Alves  <palves@redhat.com>
+
+	PR gdb/20413
+	* nat/linux-ptrace.c: Include <sys/procfs.h> instead of
+	"gregset.h".
+
 2016-08-10  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/19187
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 980ed53..f00f179 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -23,7 +23,7 @@
 #include "buffer.h"
 #include "gdb_wait.h"
 #include "gdb_ptrace.h"
-#include "gregset.h"
+#include <sys/procfs.h>
 
 /* Stores the ptrace options supported by the running kernel.
    A value of -1 means we did not check for features yet.  A value


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]