From cb832706eb69c5150f3649931b3c17fd9a9e0982 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 10 Apr 2006 16:13:01 +0000 Subject: [PATCH] * win32-nat.c (do_win32_fetch_inferior_registers): Don't do anything with saved context if __COPY_CONTEXT_SIZE is not defined. (handle_output_debug_string): Ditto. --- gdb/ChangeLog | 6 ++++++ gdb/win32-nat.c | 4 ++++ gdb/windows-nat.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d08634dfd91..20eeab2fce2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2006-04-10 Christopher Faylor + + * win32-nat.c (do_win32_fetch_inferior_registers): Don't do anything + with saved context if __COPY_CONTEXT_SIZE is not defined. + (handle_output_debug_string): Ditto. + 2006-04-10 Daniel Jacobowitz * arm-linux-tdep.c (arm_linux_extract_return_value): Use gdb_byte. diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 42488580a4e..cbafa96d34c 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -354,6 +354,7 @@ do_win32_fetch_inferior_registers (int r) if (current_thread->reload_context) { +#ifdef __COPY_CONTEXT_SIZE if (have_saved_context) { /* Lie about where the program actually is stopped since cygwin has informed us that @@ -363,6 +364,7 @@ do_win32_fetch_inferior_registers (int r) have_saved_context = 0; } else +#endif { thread_info *th = current_thread; th->context.ContextFlags = CONTEXT_DEBUGGER_DR; @@ -928,6 +930,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) if (strncmp (s, "cYg", 3) != 0) warning (("%s"), s); } +#ifdef __COPY_CONTEXT_SIZE else { /* Got a cygwin signal marker. A cygwin signal is followed by the signal number @@ -955,6 +958,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) current_event.dwThreadId = retval; } } +#endif if (s) xfree (s); diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 42488580a4e..cbafa96d34c 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -354,6 +354,7 @@ do_win32_fetch_inferior_registers (int r) if (current_thread->reload_context) { +#ifdef __COPY_CONTEXT_SIZE if (have_saved_context) { /* Lie about where the program actually is stopped since cygwin has informed us that @@ -363,6 +364,7 @@ do_win32_fetch_inferior_registers (int r) have_saved_context = 0; } else +#endif { thread_info *th = current_thread; th->context.ContextFlags = CONTEXT_DEBUGGER_DR; @@ -928,6 +930,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) if (strncmp (s, "cYg", 3) != 0) warning (("%s"), s); } +#ifdef __COPY_CONTEXT_SIZE else { /* Got a cygwin signal marker. A cygwin signal is followed by the signal number @@ -955,6 +958,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) current_event.dwThreadId = retval; } } +#endif if (s) xfree (s); -- 2.30.2