diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-05-30 13:05:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-05-30 13:08:29 +0300 |
| commit | f045cbadc7e222520eb457966ae739ff53ddfd76 (patch) | |
| tree | a501f53ff5293721f18d227d6721fdbdc13a3c39 | |
| parent | 1302b22e668508f770fc032796393647d09eae33 (diff) | |
| download | binutils-f045cbadc7e222520eb457966ae739ff53ddfd76.zip binutils-f045cbadc7e222520eb457966ae739ff53ddfd76.tar.gz binutils-f045cbadc7e222520eb457966ae739ff53ddfd76.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.
(cherry picked from commit 99cee7b71f81a9d346fc1a2f4e678537f1bb945f)
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/go32-nat.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8e932f2..8976394 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 Roland McGrath <mcgrathr@google.com> PR gdb/18464 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; } |