x86-64: Use pr22393-3a.so and pr22393-3a-now.so

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

diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
index 68be98d15b21fed61ac335ffef8bf9a3ccd3e656..679bb861eb989289fff78d77249f012da9abccbc 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, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -59,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,
@@ -68,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 */
@@ -89,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 */
@@ -130,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)
 {
@@ -141,9 +138,7 @@ _initialize_amd64_sol2_nat (void)
   /* Fill in the generic procfs methods.  */
   t = procfs_target ();
 
-#ifdef NEW_PROC_API    /* Solaris 6 and above can do HW watchpoints */
   procfs_use_watchpoints (t);
-#endif
 
 #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)
   amd64_native_gregset32_reg_offset = amd64_sol2_gregset32_reg_offset;