From 043780a1fb7055b5af0f3fd8baf4f2f90d94043d Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Thu, 15 Mar 2001 16:55:15 +0000
Subject: [PATCH] Add ``attrib'' parameter to *xfer_memory() functions.

---
 gdb/ChangeLog    | 11 ++++++++++-
 gdb/gnu-nat.c    |  1 +
 gdb/infttrace.c  |  1 +
 gdb/lin-thread.c |  3 ++-
 gdb/mac-nat.c    |  5 +++--
 gdb/procfs.c     |  6 ++++--
 gdb/symm-nat.c   |  1 +
 gdb/wince.c      |  5 +++--
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ba5ea5d26..364029ef82 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-15  Andrew Cagney  <ac131313@redhat.com>
+
+	* wince.c (child_xfer_memory): Add attrib parameter.
+	* symm-nat.c (child_xfer_memory): Ditto.
+	* mac-nat.c (child_xfer_memory): Ditto.
+	* infttrace.c (child_xfer_memory): Ditto.
+	* procfs.c (procfs_xfer_memory): Ditto.
+	* lin-thread.c (thread_db_xfer_memory): Ditto.
+	* gnu-nat.c (gnu_xfer_memory): Ditto.
+
 2001-03-14  Andrew Cagney  <ac131313@redhat.com>
 
 	* NEWS: Mention that Harris/CXUX m88k is obsolete.
@@ -50,7 +60,6 @@
 	* config/nm-m3.h: Ditto.
 	* config/nm-gnu.h: Ditto.
 
->>>>>>> 1.1049
 2001-03-14  Andrew Cagney  <ac131313@redhat.com>
 
 	* MAINTAINERS: Update list of targets. Mark arm-* and v850-elf as
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index ae22844432..54b543be75 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2447,6 +2447,7 @@ out:
    is ignored. */
 static int
 gnu_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+		 struct mem_attrib *attrib,
 		 struct target_ops *target)
 {
   task_t task = (current_inferior
diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index 884ebbc205..4cf1faa888 100644
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -4917,6 +4917,7 @@ _initialize_kernel_u_addr (void)
 
 int
 child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+		   struct mem_attrib *attrib,
 		   struct target_ops *target)
 {
   register int i;
diff --git a/gdb/lin-thread.c b/gdb/lin-thread.c
index 9a3c2443af..8c4caffc57 100644
--- a/gdb/lin-thread.c
+++ b/gdb/lin-thread.c
@@ -1216,6 +1216,7 @@ thread_db_files_info (struct target_ops *tgt_vector)
 
 static int
 thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
+		       struct mem_attrib *attrib,
 		       struct target_ops *target)
 {
   struct cleanup *old_chain;
@@ -1232,7 +1233,7 @@ thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
     }
 
   ret = target_beneath->to_xfer_memory (memaddr, myaddr, len,
-					   dowrite, target);
+					dowrite, attrib, target);
   do_cleanups (old_chain);
   return ret;
 }
diff --git a/gdb/mac-nat.c b/gdb/mac-nat.c
index e4f3ab2075..1a1daca454 100644
--- a/gdb/mac-nat.c
+++ b/gdb/mac-nat.c
@@ -225,8 +225,9 @@ child_stop (void)
 }
 
 int
-child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
-		   int write, struct target_ops *target)
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+		   struct mem_attrib *attrib,
+		   struct target_ops *target)
 {
   int i;
 
diff --git a/gdb/procfs.c b/gdb/procfs.c
index d8c5f544ee..8586238650 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -113,8 +113,9 @@ static void procfs_kill_inferior (void);
 static void procfs_mourn_inferior (void);
 static void procfs_create_inferior (char *, char *, char **);
 static int procfs_wait (int, struct target_waitstatus *);
-static int procfs_xfer_memory (CORE_ADDR,
-			       char *, int, int, struct target_ops *);
+static int procfs_xfer_memory (CORE_ADDR, char *, int, int,
+			       struct mem_attrib *attrib,
+			       struct target_ops *);
 
 static int procfs_thread_alive (int);
 
@@ -3909,6 +3910,7 @@ wait_again:
 
 static int
 procfs_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
+		    struct mem_attrib *attrib,
 		    struct target_ops *target)
 {
   procinfo *pi;
diff --git a/gdb/symm-nat.c b/gdb/symm-nat.c
index a368dc885e..f5e01a031e 100644
--- a/gdb/symm-nat.c
+++ b/gdb/symm-nat.c
@@ -748,6 +748,7 @@ detach (int signo)
 
 int
 child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+		   struct mem_attrib *attrib,
 		   struct target_ops *target)
 {
   register int i;
diff --git a/gdb/wince.c b/gdb/wince.c
index 0442c96104..0fb06db336 100644
--- a/gdb/wince.c
+++ b/gdb/wince.c
@@ -1787,8 +1787,9 @@ child_mourn_inferior (void)
 
 /* Move memory from child to/from gdb. */
 int
-child_xfer_memory (CORE_ADDR memaddr, char *our, int len,
-		   int write, struct target_ops *target)
+child_xfer_memory (CORE_ADDR memaddr, char *our, int len, int write,
+		   struct mem_attrib *attrib,
+		   struct target_ops *target)
 {
   if (len <= 0)
     return 0;