* alpha-tdep.c (alpha_gdbarch_init): Set cannot_step_breakpoint.

* config/alpha/nm-osf.h (CANNOT_STEP_BREAKPOINT): Remove.
* config/alpha/nm-linux.h (CANNOT_STEP_BREAKPOINT): Remove.
* config/alpha/nm-nbsd.h: Remove file.
* config/alpha/nm-fbsd.h: Remove file
* config/alpha/nbsd.mh (NAT_FILE): Remove.
* config/alpha/fbsd.mh (NAT_FILE): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24d93f1..329d574 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-15  Mark Kettenis  <kettenis@gnu.org>
+
+       * alpha-tdep.c (alpha_gdbarch_init): Set cannot_step_breakpoint.
+       * config/alpha/nm-osf.h (CANNOT_STEP_BREAKPOINT): Remove.
+       * config/alpha/nm-linux.h (CANNOT_STEP_BREAKPOINT): Remove.
+       * config/alpha/nm-nbsd.h: Remove file.
+       * config/alpha/nm-fbsd.h: Remove file
+       * config/alpha/nbsd.mh (NAT_FILE): Remove.
+       * config/alpha/fbsd.mh (NAT_FILE): Remove.
+
 2006-01-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * macroexp.c (expand): Initialize argc.

diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 0e2bf8b..960b051 100644 (file)
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1609,6 +1609,7 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   set_gdbarch_breakpoint_from_pc (gdbarch, alpha_breakpoint_from_pc);
   set_gdbarch_decr_pc_after_break (gdbarch, 4);
+  set_gdbarch_cannot_step_breakpoint (gdbarch, 1);
 
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);

diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
index 3ffac4b..9765ad9 100644 (file)
--- a/gdb/config/alpha/fbsd.mh
+++ b/gdb/config/alpha/fbsd.mh
@@ -2,4 +2,3 @@
 NATDEPFILES= fork-child.o inf-ptrace.o \
        fbsd-nat.o alphabsd-nat.o \
        gcore.o corelow.o core-regset.o
-NAT_FILE= nm-fbsd.h

diff --git a/gdb/config/alpha/nbsd.mh b/gdb/config/alpha/nbsd.mh
index 84c390b..b6ab74b 100644 (file)
--- a/gdb/config/alpha/nbsd.mh
+++ b/gdb/config/alpha/nbsd.mh
@@ -1,3 +1,2 @@
 # Host: NetBSD/alpha
 NATDEPFILES= fork-child.o inf-ptrace.o alphabsd-nat.o
-NAT_FILE= nm-nbsd.h

diff --git a/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h
deleted file mode 100644 (file)
index b466167..0000000
--- a/gdb/config/alpha/nm-fbsd.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Native-dependent definitions for FreeBSD/alpha.
-
-   Copyright 1986, 1987, 1989, 1992, 1996, 2000, 2004, 2005, 2006
-   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.  */
-
-#ifndef NM_FBSD_H
-#define NM_FBSD_H
-
-/* The Alpha does not step over a breakpoint.  */
-#define CANNOT_STEP_BREAKPOINT 1
-
-#endif /* nm-fbsd.h */

diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index 1958958..390cf80 100644 (file)
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -29,10 +29,6 @@
 
 #define U_REGS_OFFSET 0
 
-/* The alpha does not step over a breakpoint, the manpage is lying again.  */
-
-#define CANNOT_STEP_BREAKPOINT 1
-
 /* Given a pointer to either a gregset_t or fpregset_t, return a
    pointer to the first register.  */
 #define ALPHA_REGSET_BASE(regsetp)  ((long *) (regsetp))

diff --git a/gdb/config/alpha/nm-nbsd.h b/gdb/config/alpha/nm-nbsd.h
deleted file mode 100644 (file)
index ff69de9..0000000
--- a/gdb/config/alpha/nm-nbsd.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Native-dependent definitions for NetBSD/alpha.
-
-   Copyright 2002, 2005 Free Software Foundation, Inc.
-
-   Contributed by Wasabi Systems, 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.  */
-
-#ifndef NM_NBSD_H
-#define NM_NBSD_H
-
-/* The Alpha does not step over a breakpoint.  */
-#define CANNOT_STEP_BREAKPOINT 1
-
-#endif /* nm-nbsd.h */

diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
index 288bc35..119a036 100644 (file)
--- a/gdb/config/alpha/nm-osf.h
+++ b/gdb/config/alpha/nm-osf.h
@@ -33,10 +33,6 @@
 
 #define PTRACE_XFER_TYPE long
 
-/* The alpha does not step over a breakpoint, the manpage is lying again.  */
-
-#define CANNOT_STEP_BREAKPOINT 1
-
 /* Support for shared libraries.  */
 
 #include "solib.h"