* configure.host (alpha*-*-osf[12]*): Remove support.

	* NEWS: Mention removed configurations.

	* config/alpha/alpha-osf1.mh: Delete file.
	* config/alpha/alpha-osf2.mh: Delete file.
	* config/alpha/alpha-osf3.mh (NATDEPFILES): Remove inftarg.o
	and infptrace.o.
	* config/alpha/nm-osf.h: Delete file.
	* config/alpha/nm-osf2.h: Delete file.
	* config/alpha/nm-osf3.h: Do not include "nm-osf2.h".
	(START_INFERIOR_TRAPS_EXPECTED): Copy from nm-osf.h.
	(PROCFS_DONT_TRACE_FAULTS): Copy from nm-osf2.h.

	* alpha-nat.c (ALPHA_UNIQUE_PTRACE_ADDR): Do not define.
	(register_addr, kernel_u_size): Remove.
	Do not check for "defined(USE_PROC_FS) || defined(HAVE_GREGSET_T)".

10 files changed, 38 insertions, 120 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd81b4b..71f56b4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,24 @@
 2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* configure.host (alpha*-*-osf[12]*): Remove support.
+	* NEWS: Mention removed configurations.
+
+	* config/alpha/alpha-osf1.mh: Delete file.
+	* config/alpha/alpha-osf2.mh: Delete file.
+	* config/alpha/alpha-osf3.mh (NATDEPFILES): Remove inftarg.o
+	and infptrace.o.
+	* config/alpha/nm-osf.h: Delete file.
+	* config/alpha/nm-osf2.h: Delete file.
+	* config/alpha/nm-osf3.h: Do not include "nm-osf2.h".
+	(START_INFERIOR_TRAPS_EXPECTED): Copy from nm-osf.h.
+	(PROCFS_DONT_TRACE_FAULTS): Copy from nm-osf2.h.
+
+	* alpha-nat.c (ALPHA_UNIQUE_PTRACE_ADDR): Do not define.
+	(register_addr, kernel_u_size): Remove.
+	Do not check for "defined(USE_PROC_FS) || defined(HAVE_GREGSET_T)".
+
+2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* regcache.c (regcache_invalidate): New function.
 	(register_cached): Remove.
 	(set_register_cached): Remove.
diff --git a/gdb/NEWS b/gdb/NEWS
index d549f00..14ffee1 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -91,6 +91,8 @@ qXfer:features:read:
 
 Support for these obsolete configurations has been removed.
 
+alpha*-*-osf1*
+alpha*-*-osf2*
 d10v-*-*
 hppa*-*-hiux*
 i[34567]86-ncr-*
diff --git a/gdb/alpha-nat.c b/gdb/alpha-nat.c
index 9cede3c..caeada3 100644
--- a/gdb/alpha-nat.c
+++ b/gdb/alpha-nat.c
@@ -118,34 +118,7 @@ fetch_osf_core_registers (struct regcache *regcache,
 }
 
 
-/* Map gdb internal register number to a ptrace ``address''.
-   These ``addresses'' are defined in <sys/ptrace.h>, with
-   the exception of ALPHA_UNIQUE_PTRACE_ADDR.  */
-
-#define ALPHA_UNIQUE_PTRACE_ADDR 0
-
-CORE_ADDR
-register_addr (int regno, CORE_ADDR blockend)
-{
-  if (regno == PC_REGNUM)
-    return PC;
-  if (regno == ALPHA_UNIQUE_REGNUM)
-    return ALPHA_UNIQUE_PTRACE_ADDR;
-  if (regno < FP0_REGNUM)
-    return GPR_BASE + regno;
-  else
-    return FPR_BASE + regno - FP0_REGNUM;
-}
-
-int
-kernel_u_size (void)
-{
-  return (sizeof (struct user));
-}
-
-#if defined(USE_PROC_FS) || defined(HAVE_GREGSET_T)
 #include <sys/procfs.h>
-
 /* Prototypes for supply_gregset etc. */
 #include "gregset.h"
 
@@ -195,7 +168,6 @@ fill_fpregset (const struct regcache *regcache,
   /* FPCR is in slot 32.  */
   alpha_fill_fp_regs (regcache, regno, regp, regp + 31);
 }
-#endif
 
 
 /* Register that we are able to handle alpha core file formats. */
diff --git a/gdb/config/alpha/alpha-osf1.mh b/gdb/config/alpha/alpha-osf1.mh
deleted file mode 100644
index 837f73c..0000000
--- a/gdb/config/alpha/alpha-osf1.mh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Host: Little-endian Alpha running OSF/1-1.x
-NAT_FILE= nm-osf.h
-NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
-	solib-osf.o solib.o
diff --git a/gdb/config/alpha/alpha-osf2.mh b/gdb/config/alpha/alpha-osf2.mh
deleted file mode 100644
index d861037..0000000
--- a/gdb/config/alpha/alpha-osf2.mh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Host: Little-endian Alpha running OSF/1-2.x using procfs
-NAT_FILE= nm-osf2.h
-NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
-	solib-osf.o solib.o procfs.o proc-api.o proc-events.o proc-flags.o \
-	proc-why.o
diff --git a/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh
index 5a8f2aa..c534675 100644
--- a/gdb/config/alpha/alpha-osf3.mh
+++ b/gdb/config/alpha/alpha-osf3.mh
@@ -1,5 +1,5 @@
 # Host: Little-endian Alpha running OSF/1-3.x and higher using procfs
 NAT_FILE= nm-osf3.h
-NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \
+NATDEPFILES= corelow.o alpha-nat.o fork-child.o \
 	solib-osf.o solib.o procfs.o proc-api.o proc-events.o proc-flags.o \
 	proc-why.o
diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
deleted file mode 100644
index 1762c1c..0000000
--- a/gdb/config/alpha/nm-osf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Native definitions for alpha running OSF/1.
-
-   Copyright 1993, 1994, 1995, 1998, 2000, 2004, 2007
-   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.  */
-
-/* Number of traps that happen between exec'ing the shell
-   to run an inferior, and when we finally get to
-   the inferior code.  This is 2 on most implementations.  */
-#define START_INFERIOR_TRAPS_EXPECTED 3
-
-/* ptrace register ``addresses'' are absolute.  */
-
-#define U_REGS_OFFSET 0
-
diff --git a/gdb/config/alpha/nm-osf2.h b/gdb/config/alpha/nm-osf2.h
deleted file mode 100644
index 8057cbd..0000000
--- a/gdb/config/alpha/nm-osf2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Native definitions for alpha running OSF/1-2.x, using procfs.
-   Copyright 1995, 1996, 2000, 2007 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.  */
-
-/* Get generic OSF/1 definitions.  */
-#include "alpha/nm-osf.h"
-
-/* OSF/1-2.x has optional /proc support, try to use it instead of ptrace.  */
-#define USE_PROC_FS
-#define HAVE_OPTIONAL_PROC_FS
-
-/* Don't trace faults under OSF/1, rely on the posting of the appropriate
-   signal if fault tracing is disabled.
-   Tracing T_IFAULT under Alpha OSF/1 causes a `floating point enable'
-   fault from which we cannot continue (except by disabling the
-   tracing).
-   And as OSF/1 doesn't provide the standard fault definitions, the
-   mapping of faults to appropriate signals in procfs_wait is difficult.  */
-#define PROCFS_DONT_TRACE_FAULTS
-
-/* Work around some peculiarities in the OSF/1 procfs implementation.  */
-#define PROCFS_NEED_PIOCSSIG_FOR_KILL
-#define PROCFS_DONT_PIOCSSIG_CURSIG
-
-/* Return sizeof user struct to callers in less machine dependent routines */
-
-#define KERNEL_U_SIZE kernel_u_size()
-extern int kernel_u_size (void);
diff --git a/gdb/config/alpha/nm-osf3.h b/gdb/config/alpha/nm-osf3.h
index e9580df..ead6e66 100644
--- a/gdb/config/alpha/nm-osf3.h
+++ b/gdb/config/alpha/nm-osf3.h
@@ -18,10 +18,19 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* OSF/1-3.x fixes some OSF/1-2.x procfs peculiarities and adds
-   a new one.  */
-#include "alpha/nm-osf2.h"
+/* Number of traps that happen between exec'ing the shell
+   to run an inferior, and when we finally get to
+   the inferior code.  This is 2 on most implementations.  */
+#define START_INFERIOR_TRAPS_EXPECTED 3
 
-#undef PROCFS_NEED_PIOCSSIG_FOR_KILL
-#undef PROCFS_DONT_PIOCSSIG_CURSIG
+/* Don't trace faults under OSF/1, rely on the posting of the appropriate
+   signal if fault tracing is disabled.
+   Tracing T_IFAULT under Alpha OSF/1 causes a `floating point enable'
+   fault from which we cannot continue (except by disabling the
+   tracing).
+   And as OSF/1 doesn't provide the standard fault definitions, the
+   mapping of faults to appropriate signals in procfs_wait is difficult.  */
+#define PROCFS_DONT_TRACE_FAULTS
+
+/* Work around some peculiarities in the OSF/1 procfs implementation.  */
 #define PROCFS_NEED_CLEAR_CURSIG_FOR_KILL
diff --git a/gdb/configure.host b/gdb/configure.host
index e8258d5..d3b6713 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -13,6 +13,8 @@
 # The default is $host_cpu.
 
 case $host in
+ alpha*-*-osf1* | \
+ alpha*-*-osf2* | \
  hppa*-*-hiux* | \
  i[34567]86-ncr-* | \
  i[34567]86-*-dgux* | \
@@ -60,8 +62,6 @@ esac
 
 case "${host}" in
 
-alpha*-*-osf1*)		gdb_host=alpha-osf1 ;;
-alpha*-*-osf2*)		gdb_host=alpha-osf2 ;;
 alpha*-*-osf[3456789]*)	gdb_host=alpha-osf3 ;;
 alpha*-*-linux*)	gdb_host=alpha-linux ;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)