From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Tue, 13 May 2014 12:55:53 +0000 (+0200)
Subject: S390: Fix erroneous offset in fill_gregset.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b44a3a57d17ea2d35823780007a38daeeaec6a4;p=binutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a622eb830e6..7dcb166ae0c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-13  Andreas Arnez  <arnez@vnet.linux.ibm.com>
+
+	* s390-linux-nat.c (fill_gregset): Remove erroneous offset 4 in
+	call to regcache_raw_collect.
+
 2014-05-12  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* mi/mi-console.c (mi_console_raw_packet): Use the value from
diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index 5c3895202ad..45db7c998cb 100644
--- 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);
 	    }
 	}