[gdb/testsuite] Fix regexp in py-rbreak.exp

[deliverable/binutils-gdb.git] / gdb / i386-sol2-nat.c

diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
index d915d3cb9490acf4faa57ee4c25991f2283782d1..992ecb7ed1e7f6959117910120826f1259f88758 100644 (file)
--- a/gdb/i386-sol2-nat.c
+++ b/gdb/i386-sol2-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for Solaris x86.
 
-   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,6 +22,8 @@
 
 #include <sys/procfs.h>
 #include "gregset.h"
+#include "target.h"
+#include "procfs.h"
 
 /* This file provids the (temporary) glue between the Solaris x86
    target dependent code and the machine independent SVR4 /proc
@@ -57,7 +59,7 @@ static int amd64_sol2_gregset64_reg_offset[] = {
   8 * 8,                       /* %rdi */
   10 * 8,                      /* %rbp */
   20 * 8,                      /* %rsp */
-  7 * 8,                       /* %r8 ... */
+  7 * 8,                       /* %r8 ...  */
   6 * 8,
   5 * 8,
   4 * 8,
@@ -66,7 +68,7 @@ static int amd64_sol2_gregset64_reg_offset[] = {
   1 * 8,
   0 * 8,                       /* ... %r15 */
   17 * 8,                      /* %rip */
-  16 * 8,                      /* %eflags */
+  19 * 8,                      /* %eflags */
   18 * 8,                      /* %cs */
   21 * 8,                      /* %ss */
   25 * 8,                      /* %ds */
@@ -87,7 +89,7 @@ static int amd64_sol2_gregset32_reg_offset[] = {
   9 * 8,                       /* %esi */
   8 * 8,                       /* %edi */
   17 * 8,                      /* %eip */
-  16 * 8,                      /* %eflags */
+  19 * 8,                      /* %eflags */
   18 * 8,                      /* %cs */
   21 * 8,                      /* %ss */
   25 * 8,                      /* %ds */
@@ -128,9 +130,6 @@ fill_fpregset (const struct regcache *regcache,
 
 #endif
 
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-extern void _initialize_amd64_sol2_nat (void);
-
 void
 _initialize_amd64_sol2_nat (void)
 {