From 967c0d836c8acc7fa86dd490c483f850dbadb851 Mon Sep 17 00:00:00 2001 From: Marko Mlinar Date: Thu, 10 Oct 2002 07:41:37 +0000 Subject: [PATCH] Convert #ifdef HAVE_NONSTEPPABLE_WATCHPOINT into C --- gdb/ChangeLog | 6 ++++++ gdb/gdbarch.c | 13 +++++++------ gdb/infrun.c | 7 ------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e77698f..187e37e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2002-10-10 Marko Mlinar + + * infrun.c (resume): Convert #ifdef HAVE_NONSTEPPABLE_WATCHPOINT into C, + accidentially not commited 2002-10-09 + * gdbarch.h, gdbarch.c: Re-generate. + 2002-10-09 Marko Mlinar * infrun.c (resume): Convert #ifdef HAVE_NONSTEPPABLE_WATCHPOINT into C. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index bca1043..fe40062 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -430,6 +430,7 @@ struct gdbarch startup_gdbarch = 0, "malloc", 0, + 0, /* startup_gdbarch() */ }; @@ -1385,13 +1386,13 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) (long) current_gdbarch->get_saved_register /*GET_SAVED_REGISTER ()*/); #endif -#ifdef HAVE_STEPPABLE_WATCHPOINT +#ifdef HAVE_NONSTEPPABLE_WATCHPOINT fprintf_unfiltered (file, - "gdbarch_dump: HAVE_STEPPABLE_WATCHPOINT # %s\n", - XSTRING (HAVE_STEPPABLE_WATCHPOINT)); + "gdbarch_dump: HAVE_NONSTEPPABLE_WATCHPOINT # %s\n", + XSTRING (HAVE_NONSTEPPABLE_WATCHPOINT)); fprintf_unfiltered (file, - "gdbarch_dump: HAVE_STEPPABLE_WATCHPOINT = %d\n", - HAVE_STEPPABLE_WATCHPOINT); + "gdbarch_dump: HAVE_NONSTEPPABLE_WATCHPOINT = %d\n", + HAVE_NONSTEPPABLE_WATCHPOINT); #endif #ifdef INIT_EXTRA_FRAME_INFO #if GDB_MULTI_ARCH @@ -5074,7 +5075,7 @@ gdbarch_have_nonsteppable_watchpoint (struct gdbarch *gdbarch) void set_gdbarch_have_nonsteppable_watchpoint (struct gdbarch *gdbarch, - int have_nonsteppable_watchpoint) + int have_nonsteppable_watchpoint) { gdbarch->have_nonsteppable_watchpoint = have_nonsteppable_watchpoint; } diff --git a/gdb/infrun.c b/gdb/infrun.c index 89a1d23..0de1a66 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -231,13 +231,6 @@ a command like `return' or `jump' to continue execution."); #define HAVE_STEPPABLE_WATCHPOINT 1 #endif -#ifndef HAVE_NONSTEPPABLE_WATCHPOINT -#define HAVE_NONSTEPPABLE_WATCHPOINT 0 -#else -#undef HAVE_NONSTEPPABLE_WATCHPOINT -#define HAVE_NONSTEPPABLE_WATCHPOINT 1 -#endif - #ifndef HAVE_CONTINUABLE_WATCHPOINT #define HAVE_CONTINUABLE_WATCHPOINT 0 #else -- 2.7.4