[PATCH v4] gdbserver: uclinux: pull in ptrace offset definitions from asm/ptrace.h

[PATCH v4] gdbserver: uclinux: pull in ptrace offset definitions from asm/ptrace.h

[Will Deacon]

When debugging a uclinux target, it is necessary to retrieve the text
and data offsets of the running program in order for symbol resolution
to work correctly.

This patch pulls in definitions for PT_{TEXT,DATA,TEXT_END}_ADDR from
the kernel's exported ptrace header, which can be issued as `magic'
addresses to the PTRACE_PEEKUSER request in order to retrieve the child
offsets. For those architectures currently providing their own inline
definitions, the existing code is used as a fallback if the header
doesn't provide any overrides.
---

2012-04-26  Will Deacon  <will.deacon@arm.com>

	* linux-low.c [__UCLIBC__ && !(__UCLIBC_HAS_MMU__ || __ARCH_HAS_MMU__)]:
	Include asm/ptrace.h.
	(PT_TEXT_ADDR, PT_DATA_ADDR, PT_TEXT_END_ADDR): Define only if not
	already defined.

 gdb/gdbserver/linux-low.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index bbb0693..f8d0c99 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -78,6 +78,8 @@
 
 #ifdef __UCLIBC__
 #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
+/* PTRACE_TEXT_ADDR and friends.  */
+#include <asm/ptrace.h>
 #define HAS_NOMMU
 #endif
 #endif
@@ -4759,6 +4761,9 @@ linux_stopped_data_address (void)
 }
 
 #if defined(__UCLIBC__) && defined(HAS_NOMMU)
+#if ! (defined(PT_TEXT_ADDR) \
+       || defined(PT_DATA_ADDR) \
+       || defined(PT_TEXT_END_ADDR))
 #if defined(__mcoldfire__)
 /* These should really be defined in the kernel's ptrace.h header.  */
 #define PT_TEXT_ADDR 49*4
@@ -4773,6 +4778,7 @@ linux_stopped_data_address (void)
 #define PT_DATA_ADDR     (0x10004*4)
 #define PT_TEXT_END_ADDR (0x10008*4)
 #endif
+#endif
 
 /* Under uClinux, programs are loaded at non-zero offsets, which we need
    to tell gdb about.  */
-- 
1.7.4.1

Re: [PATCH v4] gdbserver: uclinux: pull in ptrace offset definitions from asm/ptrace.h

[Pedro Alves]

On 04/27/2012 11:51 AM, Will Deacon wrote:

> 2012-04-26  Will Deacon  <will.deacon@arm.com>
> 
> 	* linux-low.c [__UCLIBC__ && !(__UCLIBC_HAS_MMU__ || __ARCH_HAS_MMU__)]:
> 	Include asm/ptrace.h.
> 	(PT_TEXT_ADDR, PT_DATA_ADDR, PT_TEXT_END_ADDR): Define only if not
> 	already defined.


Okay, thanks.

-- 
Pedro Alves

Re: [PATCH v4] gdbserver: uclinux: pull in ptrace offset definitions from asm/ptrace.h

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 677 bytes --]

On Friday 27 April 2012 06:51:26 Will Deacon wrote:
> When debugging a uclinux target, it is necessary to retrieve the text
> and data offsets of the running program in order for symbol resolution
> to work correctly.
> 
> This patch pulls in definitions for PT_{TEXT,DATA,TEXT_END}_ADDR from
> the kernel's exported ptrace header, which can be issued as `magic'
> addresses to the PTRACE_PEEKUSER request in order to retrieve the child
> offsets. For those architectures currently providing their own inline
> definitions, the existing code is used as a fallback if the header
> doesn't provide any overrides.

Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]