diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b89be5deb1..c7c727b9bd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-04  Michal Ludvig  <mludvig@suse.cz>
+
+	* gdbserver/linux-x86-64-low.c (x86_64_regmap): Make it an array of 
+	byte offsets instead of an array of indexes.
+	(x86_64_store_gregset, x86_64_store_fpregset): Parameter made const.
+
 2002-07-03  Andrew Cagney  <ac131313@redhat.com>
 
 	* gdbarch.sh (struct regcache): Add opaque declaration.
diff --git a/gdb/gdbserver/linux-x86-64-low.c b/gdb/gdbserver/linux-x86-64-low.c
index 1f80d990cc..b03dcfaeb6 100644
--- a/gdb/gdbserver/linux-x86-64-low.c
+++ b/gdb/gdbserver/linux-x86-64-low.c
@@ -31,12 +31,12 @@
 #define	X86_64_NUM_GREGS 22
 
 static int x86_64_regmap[X86_64_NUM_GREGS] = {
-  RAX, RBX, RCX, RDX,
-  RSI, RDI, RBP, RSP,
-  R8, R9, R10, R11,
-  R12, R13, R14, R15,
-  RIP, EFLAGS,
-  DS, ES, FS, GS
+  RAX * 8, RBX * 8, RCX * 8, RDX * 8,
+  RSI * 8, RDI * 8, RBP * 8, RSP * 8,
+  R8 * 8, R9 * 8, R10 * 8, R11 * 8,
+  R12 * 8, R13 * 8, R14 * 8, R15 * 8,
+  RIP * 8, EFLAGS * 8,
+  DS * 8, ES * 8, FS * 8, GS * 8
 };
 
 static void
@@ -49,7 +49,7 @@ x86_64_fill_gregset (void *buf)
 }
 
 static void
-x86_64_store_gregset (void *buf)
+x86_64_store_gregset (const void *buf)
 {
   int i;
 
@@ -64,7 +64,7 @@ x86_64_fill_fpregset (void *buf)
 }
 
 static void
-x86_64_store_fpregset (void *buf)
+x86_64_store_fpregset (const void *buf)
 {
   i387_fxsave_to_cache (buf);
 }