diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/config/i386/nm-linux.h | 2 | ||||
| -rw-r--r-- | gdb/config/nm-linux.h | 2 | ||||
| -rw-r--r-- | gdb/config/nm-lynx.h | 2 | ||||
| -rw-r--r-- | gdb/infptrace.c | 15 | ||||
| -rw-r--r-- | gdb/infttrace.c | 6 |
6 files changed, 26 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 471d2a7..be1c785 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2004-09-20 Andrew Cagney <cagney@gnu.org> + + * config/nm-lynx.h (DEPRECATED_CHILD_RESUME): Deprecate + CHILD_RESUME. + * config/i386/nm-linux.h (DEPRECATED_CHILD_RESUME): Ditto. + * config/nm-linux.h (DEPRECATED_KILL_INFERIOR): Deprecate + KILL_INFERIOR. + * infptrace.c: Update. + 2004-09-19 Daniel Jacobowitz <dan@debian.org> * symtab.c (output_source_filename): Mark first argument as const. diff --git a/gdb/config/i386/nm-linux.h b/gdb/config/i386/nm-linux.h index 1df875f..40c3e05 100644 --- a/gdb/config/i386/nm-linux.h +++ b/gdb/config/i386/nm-linux.h @@ -80,7 +80,7 @@ extern int cannot_store_register (int regno); #endif /* Override child_resume in `infptrace.c'. */ -#define CHILD_RESUME +#define DEPRECATED_CHILD_RESUME /* `linux-nat.c' and `i386-nat.c' have their own versions of child_post_startup_inferior. Define this to use the copy in diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h index 870e40d..fc784e3 100644 --- a/gdb/config/nm-linux.h +++ b/gdb/config/nm-linux.h @@ -68,7 +68,7 @@ extern void lin_thread_get_thread_signals (sigset_t *mask); #define CHILD_POST_STARTUP_INFERIOR #define CHILD_POST_ATTACH #define CHILD_FOLLOW_FORK -#define KILL_INFERIOR +#define DEPRECATED_KILL_INFERIOR #define NATIVE_XFER_AUXV procfs_xfer_auxv #include "auxv.h" /* Declares it. */ diff --git a/gdb/config/nm-lynx.h b/gdb/config/nm-lynx.h index 4a55a13..d4ff5a4 100644 --- a/gdb/config/nm-lynx.h +++ b/gdb/config/nm-lynx.h @@ -64,7 +64,7 @@ struct target_waitstatus; /* Override child_resume in infptrace.c */ -#define CHILD_RESUME +#define DEPRECATED_CHILD_RESUME /* Override child_thread_alive in intarg.c */ diff --git a/gdb/infptrace.c b/gdb/infptrace.c index fb7736c..a9abbf2 100644 --- a/gdb/infptrace.c +++ b/gdb/infptrace.c @@ -148,7 +148,11 @@ ptrace_wait (ptid_t ptid, int *status) return wstate; } -#ifndef KILL_INFERIOR +#ifndef DEPRECATED_KILL_INFERIOR +/* NOTE: cagney/2004-09-12: Instead of definining this macro, code + should call inf_ptrace_target to get a basic ptrace target and then + locally update any necessary methods. See ppcnbsd-nat.c. */ + void kill_inferior (void) { @@ -170,9 +174,12 @@ kill_inferior (void) ptrace_wait (null_ptid, &status); target_mourn_inferior (); } -#endif /* KILL_INFERIOR */ +#endif /* DEPRECATED_KILL_INFERIOR */ -#ifndef CHILD_RESUME +#ifndef DEPRECATED_CHILD_RESUME +/* NOTE: cagney/2004-09-12: Instead of definining this macro, code + should call inf_ptrace_target to get a basic ptrace target and then + locally update any necessary methods. See ppcnbsd-nat.c. */ /* Resume execution of the inferior process. If STEP is nonzero, single-step it. @@ -211,7 +218,7 @@ child_resume (ptid_t ptid, int step, enum target_signal signal) if (errno != 0) perror_with_name ("ptrace"); } -#endif /* CHILD_RESUME */ +#endif /* DEPRECATED_CHILD_RESUME */ /* Start debugging the process whose number is PID. */ diff --git a/gdb/infttrace.c b/gdb/infttrace.c index fcb4d02..30e893c 100644 --- a/gdb/infttrace.c +++ b/gdb/infttrace.c @@ -3842,7 +3842,7 @@ kill_inferior (void) } -#ifndef CHILD_RESUME +#ifndef DEPRECATED_CHILD_RESUME /* Sanity check a thread about to be continued. */ @@ -4253,7 +4253,7 @@ threads_continue_one_with_signal (lwpid_t gdb_tid, int signal) } #endif -#ifndef CHILD_RESUME +#ifndef DEPRECATED_CHILD_RESUME /* Resume execution of the inferior process. @@ -4554,7 +4554,7 @@ child_resume (ptid_t ptid, int step, enum target_signal signal) #endif } -#endif /* CHILD_RESUME */ +#endif /* DEPRECATED_CHILD_RESUME */ /* * Like it says. |