From 28fdd9467e121cee51667a86359f475f5b09440d Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 8 Feb 2005 01:25:23 +0000 Subject: [PATCH] - Modify previous gcore patch to only apply to ia64. --- gdb-6.3-gcore-thread-20050204.patch | 30 ++++++++++++++++++----------- gdb.spec | 5 ++++- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gdb-6.3-gcore-thread-20050204.patch b/gdb-6.3-gcore-thread-20050204.patch index f425d54..47cd1ca 100644 --- a/gdb-6.3-gcore-thread-20050204.patch +++ b/gdb-6.3-gcore-thread-20050204.patch @@ -1,19 +1,19 @@ -2005-02-04 Jeff Johnston +2005-02-07 Jeff Johnston - * linux-nat.c (linux_nat_xfer_memory): Don't use - linux_proc_xfer_memory for threads. + * linux-nat.c (linux_nat_xfer_memory): Don't use + linux_proc_xfer_memory for ia64 threads. --- gdb-6.3/gdb/linux-nat.c.fix Fri Feb 4 22:52:40 2005 -+++ gdb-6.3/gdb/linux-nat.c Fri Feb 4 22:56:57 2005 -@@ -2382,11 +2382,18 @@ linux_nat_xfer_memory (CORE_ADDR memaddr ++++ 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 + struct cleanup *old_chain = save_inferior_ptid (); int xfer; - if (is_lwp (inferior_ptid)) -- inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); -- -- xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target); -- if (xfer == 0) -- xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); ++#ifdef NATIVE_XFER_UNWIND_TABLE ++ /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory ++ 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)); @@ -26,6 +26,14 @@ + if (xfer == 0) + 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)); + + xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target); + if (xfer == 0) + xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); ++#endif do_cleanups (old_chain); return xfer; diff --git a/gdb.spec b/gdb.spec index d665f72..6e8c4a7 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.16 +Release: 0.17 License: GPL Group: Development/Debuggers @@ -418,6 +418,9 @@ fi # don't include the files in include, they are part of binutils %changelog +* Mon Feb 07 2005 Jeff Johnston 6.3.0.0-0.17 +- Modify previous gcore patch to only apply to ia64. + * Fri Feb 04 2005 Jeff Johnston 6.3.0.0-0.16 - Fix gcore to work properly for threaded applications - Bugzilla 145309, 145092