* inf-ptrace.c (inf_ptrace_xfer_partial): Use PIOD_WRITE_I instead

of PIOD_WRITE_D.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3ef2cd9fe4baf3fab7c099c7a11458ea85793ae5..1d0b6c75c5e004d158190e23247776f5c18f94b5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-20  Mark Kettenis  <kettenis@gnu.org>
+
+       * inf-ptrace.c (inf_ptrace_xfer_partial): Use PIOD_WRITE_I instead
+       of PIOD_WRITE_D.
+
 2005-11-19  Jim Blandy  <jimb@redhat.com>
 
        * tracepoint.c (memrange_absolute): New enum constant.

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index d12d1ad321433092e752c865eba75532ef7175e7..f3c399ea30981489f021aa9d09e2f286f53841f7 100644 (file)
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -462,8 +462,12 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
        struct ptrace_io_desc piod;
 
        /* NOTE: We assume that there are no distinct address spaces
-          for instruction and data.  */
-       piod.piod_op = writebuf ? PIOD_WRITE_D : PIOD_READ_D;
+          for instruction and data.  However, on OpenBSD 3.9 and
+          later, PIOD_WRITE_D doesn't allow changing memory that's
+          mapped read-only.  Since most code segments will be
+          read-only, using PIOD_WRITE_D will prevent us from
+          inserting breakpoints, so we use PIOD_WRITE_I instead.  */
+       piod.piod_op = writebuf ? PIOD_WRITE_I : PIOD_READ_D;
        piod.piod_addr = writebuf ? (void *) writebuf : readbuf;
        piod.piod_offs = (void *) (long) offset;
        piod.piod_len = len;