aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-05-30 13:05:53 +0300
committerEli Zaretskii <eliz@gnu.org>2015-05-30 13:05:53 +0300
commit99cee7b71f81a9d346fc1a2f4e678537f1bb945f (patch)
tree078bea55e551088e13476f4f99e3318c8df1ee5b
parent6809615b88590aa911fe71839ec753cfaedf987d (diff)
downloadgdb-99cee7b71f81a9d346fc1a2f4e678537f1bb945f.zip
gdb-99cee7b71f81a9d346fc1a2f4e678537f1bb945f.tar.gz
gdb-99cee7b71f81a9d346fc1a2f4e678537f1bb945f.tar.bz2
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.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/go32-nat.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de6bf9e..72e6f4a 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 f3966cd..4f5c2d2 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;
}