From 9dde329b2022df9f6df6f29646236c2549b5b2e7 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 8 Feb 2005 21:02:35 +0000 Subject: [PATCH] - Modify previous gcore patch to not use linux_proc_xfer_memory even for main thread. --- gdb-6.3-gcore-thread-20050204.patch | 21 ++++++--------------- gdb.spec | 6 +++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/gdb-6.3-gcore-thread-20050204.patch b/gdb-6.3-gcore-thread-20050204.patch index 47cd1ca..aaa46ec 100644 --- a/gdb-6.3-gcore-thread-20050204.patch +++ b/gdb-6.3-gcore-thread-20050204.patch @@ -1,11 +1,11 @@ 2005-02-07 Jeff Johnston * linux-nat.c (linux_nat_xfer_memory): Don't use - linux_proc_xfer_memory for ia64 threads. + linux_proc_xfer_memory for ia64. --- gdb-6.3/gdb/linux-nat.c.fix Fri Feb 4 22:52:40 2005 -+++ gdb-6.3/gdb/linux-nat.c Mon Feb 7 19:56:01 2005 -@@ -2381,12 +2381,31 @@ linux_nat_xfer_memory (CORE_ADDR memaddr ++++ gdb-6.3/gdb/linux-nat.c Tue Feb 8 15:49:09 2005 +@@ -2381,12 +2381,22 @@ linux_nat_xfer_memory (CORE_ADDR memaddr struct cleanup *old_chain = save_inferior_ptid (); int xfer; @@ -14,18 +14,9 @@ + for accessing thread storage. Revert when Bugzilla 147436 + is fixed. */ + if (is_lwp (inferior_ptid)) -+ { -+ /* For lwps, we cannot use linux_proc_xfer_memory. */ -+ inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); -+ xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+ } -+ else -+ { -+ xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, -+ attrib, target); -+ if (xfer == 0) -+ xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+ } ++ inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); ++ ++ xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); +#else if (is_lwp (inferior_ptid)) inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); diff --git a/gdb.spec b/gdb.spec index 6e8c4a7..8e8edd8 100644 --- a/gdb.spec +++ b/gdb.spec @@ -11,7 +11,7 @@ Name: gdb Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 0.17 +Release: 0.18 License: GPL Group: Development/Debuggers @@ -418,6 +418,10 @@ fi # don't include the files in include, they are part of binutils %changelog +* Tue Feb 08 2005 Jeff Johnston 6.3.0.0-0.18 +- Modify previous gcore patch to not use linux_proc_xfer_memory even + for main thread. + * Mon Feb 07 2005 Jeff Johnston 6.3.0.0-0.17 - Modify previous gcore patch to only apply to ia64.