From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Tue, 13 May 2014 12:55:53 +0000 (+0200)
Subject: PR target/16940 S390: Fix erroneous offset in fill_gregset.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20dca09662aa0d2706fbe325b8f448ef74773028;p=thirdparty%2Fbinutils-gdb.git

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 064be6c93b0..92c3bdecb45 100644
--- 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 ee9b617deec..e3adc48d4a1 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);
 	    }
 	}