merge from gcc

[deliverable/binutils-gdb.git] / gdb / x86-64-linux-tdep.c

diff --git a/gdb/x86-64-linux-tdep.c b/gdb/x86-64-linux-tdep.c
index e237f9efe65074c7d04d1b79455390885e3fe63e..71a5364f0e6fb88ce2629f5df078201211dd0195 100644 (file)
--- a/gdb/x86-64-linux-tdep.c
+++ b/gdb/x86-64-linux-tdep.c
@@ -68,7 +68,7 @@ static int user_to_gdb_regmap[] =
   USER_RSI, USER_RDI, USER_RBP, USER_RSP,
   USER_R8, USER_R9, USER_R10, USER_R11,
   USER_R12, USER_R13, USER_R14, USER_R15,
-  USER_RIP, USER_EFLAGS, USER_CS, USER_SS,
+  USER_RIP, USER_EFLAGS,
   USER_DS, USER_ES, USER_FS, USER_GS
 };
 
@@ -123,7 +123,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
       if (core_reg_size != 512)
        warning ("Wrong size XMM register set in core file.");
       else
-       x86_64_supply_fxsave (core_reg_sect, -1);
+       x86_64_supply_fxsave (current_regcache, -1, core_reg_sect);
       break;
 
     default:
@@ -234,7 +234,7 @@ x86_64_linux_sigcontext_addr (struct frame_info *next_frame)
 \f
 
 /* From <asm/sigcontext.h>.  */
-static int x86_64_linux_sc_reg_offset[X86_64_NUM_GREGS] =
+static int x86_64_linux_sc_reg_offset[] =
 {
   13 * 8,                      /* %rax */
   11 * 8,                      /* %rbx */
@@ -275,7 +275,7 @@ x86_64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   tdep->sigcontext_addr = x86_64_linux_sigcontext_addr;
   tdep->sc_reg_offset = x86_64_linux_sc_reg_offset;
-  tdep->sc_num_regs = X86_64_NUM_GREGS;
+  tdep->sc_num_regs = ARRAY_SIZE (x86_64_linux_sc_reg_offset);
 }
 \f