diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 33973e24a0..00e56529eb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-09  Mark Kettenis  <kettenis@gnu.org>
 
+	* amd64-linux-nat.c (fetch_inferior_registers): Correctly check
+	whether a register is supplied by PTRACE_GETFPREGS.
+	(store_inferior_registers): Likewise.
+	* amd64bsd-nat.c (fetch_inferior_registers): Correctly check
+	whether a register is supplied by PT_GETFPREGS.
+	(store_inferior_registers): Likewise.
+
 	* config/i386/linux.mt (TDEPFILES): Remove solib-legacy.o.
 	* config/i386/linux64.mt (TDEPFILES): Likewise.
 
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 72aa73ccd3..ab4725e1dd 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -169,7 +169,7 @@ fetch_inferior_registers (int regnum)
 	return;
     }
 
-  if (regnum == -1 || regnum >= AMD64_ST0_REGNUM)
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
     {
       elf_fpregset_t fpregs;
 
@@ -210,7 +210,7 @@ store_inferior_registers (int regnum)
 	return;
     }
 
-  if (regnum == -1 || regnum >= AMD64_ST0_REGNUM)
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
     {
       elf_fpregset_t fpregs;
 
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index 777fd690b3..02f4d58132 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -54,7 +54,7 @@ fetch_inferior_registers (int regnum)
 	return;
     }
 
-  if (regnum == -1 || regnum >= AMD64_ST0_REGNUM)
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
     {
       struct fpreg fpregs;
 
@@ -90,7 +90,7 @@ store_inferior_registers (int regnum)
 	return;
     }
 
-  if (regnum == -1 || regnum >= AMD64_ST0_REGNUM)
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
     {
       struct fpreg fpregs;