PR target/16940 S390: Fix erroneous offset in fill_gregset.

This fixes a bug that leads to various failures when debugging a
31-bit inferior with a 64-bit gdb on s390x.

Conflicts:

	gdb/ChangeLog

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 064be6c93b00d27e678a3e3e654fe00fb712fdec..92c3bdecb4500fce9e45e7809f118f9fec525c8f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-13  Andreas Arnez  <arnez@vnet.linux.ibm.com>
+
+       PR target/16940
+       * s390-linux-nat.c (fill_gregset): Remove erroneous offset 4 in
+       call to regcache_raw_collect.
+
 2014-05-05  Joel Brobecker  <brobecker@adacore.com>
 
        * version.in: Set GDB version number to 7.7.1.DATE-cvs.

diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index ee9b617deecb1ffbc255ff3dd235adbdb8a9378b..e3adc48d4a1abd65219f3a137c99940f5f7636b1 100644 (file)
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -164,7 +164,7 @@ fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno)
                  memset (p, 0, 4);
                  p += 4;
                }
-             regcache_raw_collect (regcache, reg, p + 4);
+             regcache_raw_collect (regcache, reg, p);
            }
        }