X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcore-regset.c;h=7acd99fa0edde11e6ea5831eb9439c17aed34bae;hb=b48516f9cd83b31cf7c9a1cf72aae3f3ae986911;hp=8dc2c782ad7bdb1a9d901987a4aba760d8c7ccbe;hpb=9eefc95f4bc46ea6ea7c726461daceac07e53315;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/core-regset.c b/gdb/core-regset.c
index 8dc2c782ad..7acd99fa0e 100644
--- a/gdb/core-regset.c
+++ b/gdb/core-regset.c
@@ -66,6 +66,8 @@ fetch_core_registers (struct regcache *regcache,
 {
   gdb_gregset_t gregset;
   gdb_fpregset_t fpregset;
+  gdb_gregset_t *gregset_p = &gregset;
+  gdb_fpregset_t *fpregset_p = &fpregset;
 
   switch (which)
     {
@@ -75,7 +77,7 @@ fetch_core_registers (struct regcache *regcache,
       else
 	{
 	  memcpy (&gregset, core_reg_sect, sizeof (gregset));
-	  supply_gregset (regcache, (const gdb_gregset_t *) &gregset);
+	  supply_gregset (regcache, (const gdb_gregset_t *) gregset_p);
 	}
       break;
 
@@ -85,8 +87,8 @@ fetch_core_registers (struct regcache *regcache,
       else
 	{
 	  memcpy (&fpregset, core_reg_sect, sizeof (fpregset));
-	  if (FP0_REGNUM >= 0)
-	    supply_fpregset (regcache, (const gdb_fpregset_t *) &fpregset);
+	  if (gdbarch_fp0_regnum (current_gdbarch) >= 0)
+	    supply_fpregset (regcache, (const gdb_fpregset_t *) fpregset_p);
 	}
       break;