Merge GDB 7.5.1

gdb/i386-sol2-nat.c

 /* Native-dependent code for Solaris x86.
 
    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 50 matching lines @@
   20 * 8,                       /* %rsp */
   7 * 8,                        /* %r8 ...  */
   6 * 8,
   5 * 8,
   4 * 8,
   3 * 8,
   2 * 8,
   1 * 8,
   0 * 8,                        /* ... %r15 */
   17 * 8,                       /* %rip */
-  16 * 8,                       /* %eflags */
+  19 * 8,                       /* %eflags */
   18 * 8,                       /* %cs */
   21 * 8,                       /* %ss */
   25 * 8,                       /* %ds */
   24 * 8,                       /* %es */
   22 * 8,                       /* %fs */
   23 * 8                        /* %gs */
 };
 
 /* 32-bit registers are provided by Solaris in 64-bit format, so just
    give a subset of the list above.  */
 static int amd64_sol2_gregset32_reg_offset[] = {
   14 * 8,                       /* %eax */
   13 * 8,                       /* %ecx */
   12 * 8,                       /* %edx */
   11 * 8,                       /* %ebx */
   20 * 8,                       /* %esp */
   10 * 8,                       /* %ebp */
   9 * 8,                        /* %esi */
   8 * 8,                        /* %edi */
   17 * 8,                       /* %eip */
-  16 * 8,                       /* %eflags */
+  19 * 8,                       /* %eflags */
   18 * 8,                       /* %cs */
   21 * 8,                       /* %ss */
   25 * 8,                       /* %ds */
   24 * 8,                       /* %es */
   22 * 8,                       /* %fs */
   23 * 8                        /* %gs */
 };
 
 void
 supply_gregset (struct regcache *regcache, const prgregset_t *gregs)
@@ skipping 46 matching lines @@
   amd64_native_gregset32_reg_offset = amd64_sol2_gregset32_reg_offset;
   amd64_native_gregset32_num_regs =
     ARRAY_SIZE (amd64_sol2_gregset32_reg_offset);
   amd64_native_gregset64_reg_offset = amd64_sol2_gregset64_reg_offset;
   amd64_native_gregset64_num_regs =
     ARRAY_SIZE (amd64_sol2_gregset64_reg_offset);
 #endif
 
   add_target (t);
 }