From 42c81e2acb86316457e92c13fb87793d387bd618 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 27 Mar 2007 18:32:01 +0000 Subject: [PATCH] 2007-03-27 Jon Ringle * linux-low.c: Check __ARCH_HAS_MMU__ also. --- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/linux-low.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index eb596801d0..126dd318fa 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2007-03-27 Jon Ringle + + * linux-low.c: Check __ARCH_HAS_MMU__ also. + 2007-03-27 Brooks Moses * Makefile.in: Add dummy "pdf" and "install-pdf" targets. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 790749b278..ff4f81e60c 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -42,6 +42,12 @@ # define PTRACE_SETSIGINFO 0x4203 #endif +#ifdef __UCLIBC__ +#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) +#define HAS_NOMMU +#endif +#endif + /* ``all_threads'' is keyed by the LWP ID - it should be the thread ID instead, however. This requires changing the ID in place when we go from !using_threads to using_threads, immediately. @@ -143,7 +149,7 @@ linux_create_inferior (char *program, char **allargs) void *new_process; int pid; -#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__) +#if defined(__UCLIBC__) && defined(HAS_NOMMU) pid = vfork (); #else pid = fork (); @@ -1594,7 +1600,7 @@ linux_stopped_data_address (void) return 0; } -#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__) +#if defined(__UCLIBC__) && defined(HAS_NOMMU) #if defined(__mcoldfire__) /* These should really be defined in the kernel's ptrace.h header. */ #define PT_TEXT_ADDR 49*4 @@ -1664,7 +1670,7 @@ static struct target_ops linux_target_ops = { linux_remove_watchpoint, linux_stopped_by_watchpoint, linux_stopped_data_address, -#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__) +#if defined(__UCLIBC__) && defined(HAS_NOMMU) linux_read_offsets, #else NULL,