From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 May 2015 10:05:53 +0000 (+0300)
Subject: Unbreak DJGPP build of GDB.
X-Git-Tag: users/hjl/linux/release/2.25.51.0.3~1^2~7^2~221
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99cee7b71f81a9d346fc1a2f4e678537f1bb945f;p=thirdparty%2Fbinutils-gdb.git

Unbreak DJGPP build of GDB.

gdb/
	* go32-nat.c (go32_xfer_memory): Fix the return value to be
	compatible to what read_child and write_child return.  This
	unbreaks that DJGPP build of GDB which was broken since v7.7.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de6bf9e7522..72e6f4a08d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* go32-nat.c (go32_xfer_memory): Fix the return value to be
+	compatible to what read_child and write_child return.  This
+	unbreaks that DJGPP build of GDB which was broken since v7.7.
+
 2015-05-29  Martin Galvan  <martin.galvan@tallertechnologies.com>
 
 	* MAINTAINERS (Write After Approval): Add Martin Galvan.
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index f3966cd534e..4f5c2d2336e 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -587,10 +587,12 @@ go32_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
   else
     res = read_child (memaddr, readbuf, len);
 
-  if (res <= 0)
+  /* read_child and write_child return zero on success, non-zero on
+     failure.  */
+  if (res != 0)
     return TARGET_XFER_E_IO;
 
-  *xfered_len = res;
+  *xfered_len = len;
   return TARGET_XFER_OK;
 }