From c3364ea481777dd0baa88d9c02cd7e81d247ae8a Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 13 Mar 2004 13:07:20 +0000 Subject: [PATCH] * config/i386/nm-fbsd.h: Include "config/nm-bsd.h". (PTRACE_ARG3_TYPE, FETCH_INFERIOR_REGISTERS, ATTACH_DETACH): Remove defines. * config/i386/nm-fbsd64.h: Likewise. * config/i386/nm-obsd.h: Likewise. * config/sparc/nm-fbsd.h: Likewise. Update copyright year. * config/alpha/nm-fbsd.h: Likewise. Update copyright year. --- gdb/ChangeLog | 10 ++++++++++ gdb/config/alpha/nm-fbsd.h | 13 ++++--------- gdb/config/i386/nm-fbsd.h | 10 ++-------- gdb/config/i386/nm-fbsd64.h | 10 ++-------- gdb/config/i386/nm-obsd.h | 11 ++--------- gdb/config/nm-bsd.h | 29 +++++++++++++++++++++++++++++ gdb/config/sparc/nm-fbsd.h | 13 +++---------- 7 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 gdb/config/nm-bsd.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1d4f021144a..757bf1b5b7f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2004-03-13 Mark Kettenis + + * config/i386/nm-fbsd.h: Include "config/nm-bsd.h". + (PTRACE_ARG3_TYPE, FETCH_INFERIOR_REGISTERS, ATTACH_DETACH): + Remove defines. + * config/i386/nm-fbsd64.h: Likewise. + * config/i386/nm-obsd.h: Likewise. + * config/sparc/nm-fbsd.h: Likewise. Update copyright year. + * config/alpha/nm-fbsd.h: Likewise. Update copyright year. + 2004-03-12 Kevin Buettner * frv-tdep.c (set_variant_scratch_registers): New function. diff --git a/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h index 2b3975a76f8..5eec1853f33 100644 --- a/gdb/config/alpha/nm-fbsd.h +++ b/gdb/config/alpha/nm-fbsd.h @@ -1,5 +1,6 @@ /* Native-dependent definitions for FreeBSD/Alpha. - Copyright 1986, 1987, 1989, 1992, 1996, 2000 + + Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -22,14 +23,8 @@ #ifndef NM_FBSD_H #define NM_FBSD_H -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE caddr_t - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS - -/* We can attach and detach. */ -#define ATTACH_DETACH +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" /* The Alpha does not step over a breakpoint. */ #define CANNOT_STEP_BREAKPOINT 1 diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h index 314e3a0f2f1..4c5683bcbd9 100644 --- a/gdb/config/i386/nm-fbsd.h +++ b/gdb/config/i386/nm-fbsd.h @@ -52,20 +52,14 @@ extern void i386bsd_dr_reset_addr (int regnum); extern unsigned long i386bsd_dr_get_status (void); -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE caddr_t - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" /* Override child_resume in `infptrace.c' to work around a kernel bug. */ #define CHILD_RESUME /* Override child_pid_to_exec_file in 'inftarg.c'. */ #define CHILD_PID_TO_EXEC_FILE - -/* We can attach and detach. */ -#define ATTACH_DETACH /* Support for the user struct. */ diff --git a/gdb/config/i386/nm-fbsd64.h b/gdb/config/i386/nm-fbsd64.h index 4c27aff6d74..061e77e1374 100644 --- a/gdb/config/i386/nm-fbsd64.h +++ b/gdb/config/i386/nm-fbsd64.h @@ -22,16 +22,10 @@ #ifndef NM_FBSD64_H #define NM_FBSD64_H -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE caddr_t - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" /* Override child_pid_to_exec_file in 'inftarg.c'. */ #define CHILD_PID_TO_EXEC_FILE -/* We can attach and detach. */ -#define ATTACH_DETACH - #endif /* nm-fbsd64.h */ diff --git a/gdb/config/i386/nm-obsd.h b/gdb/config/i386/nm-obsd.h index 4d10b539d86..7fd32ca7c43 100644 --- a/gdb/config/i386/nm-obsd.h +++ b/gdb/config/i386/nm-obsd.h @@ -22,15 +22,8 @@ #ifndef NM_OBSD_H #define NM_OBSD_H -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE caddr_t - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS - -/* We can attach and detach. */ -#define ATTACH_DETACH - +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" /* Support for the user struct. */ diff --git a/gdb/config/nm-bsd.h b/gdb/config/nm-bsd.h new file mode 100644 index 00000000000..b44dd5eff1d --- /dev/null +++ b/gdb/config/nm-bsd.h @@ -0,0 +1,29 @@ +/* Native-dependent definitions for *BSD. + + Copyright 2001, 2004 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* Type of the third argument to the `ptrace' system call. */ +#define PTRACE_ARG3_TYPE caddr_t + +/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ +#define FETCH_INFERIOR_REGISTERS + +/* We can attach and detach. */ +#define ATTACH_DETACH diff --git a/gdb/config/sparc/nm-fbsd.h b/gdb/config/sparc/nm-fbsd.h index 917cc49bf07..459764f03ad 100644 --- a/gdb/config/sparc/nm-fbsd.h +++ b/gdb/config/sparc/nm-fbsd.h @@ -1,6 +1,6 @@ /* Native-dependent definitions for FreeBSD/sparc64. - Copyright 2002, 2003 Free Software Foundation, Inc. + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by David E. O'Brien . This file is part of GDB. @@ -22,15 +22,8 @@ #ifndef NM_FBSD_H #define NM_FBSD_H -/* Type of the third argument to the `ptrace' system call. */ -#define PTRACE_ARG3_TYPE caddr_t - -/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ -#define FETCH_INFERIOR_REGISTERS - -/* We can attach and detach. */ -#define ATTACH_DETACH - +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" /* Shared library support. */ -- 2.30.2