2012-05-22 Will Deacon <will.deacon@arm.com>

	* linux-low (__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.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index cf34bacd8d717af9f7da264bab056cc04aff2ea6..5017bc600f53933d54d077947d52f0d5141b55d0 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-22  Will Deacon  <will.deacon@arm.com>
+
+       * linux-low (__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.
+
 2012-05-21  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * linux-low.c (linux_store_registers): Don't re-retrieve data

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 712cc038ed218e19669624cc5a955f2460d4f044..19f7be64170f988d100a300c91f4ba5ddeab250d 100644 (file)
--- 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
@@ -4796,6 +4798,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
@@ -4810,6 +4815,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.  */