14 files changed, 7 insertions, 79 deletions
diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
index 418bc419f8a..d3cbff7ff39 100644
--- a/gdb/config/alpha/alpha-linux.mh
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -1,10 +1,11 @@
 # Host: Little-endian Alpha running Linux
-XM_FILE= xm-alphalinux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o linux-proc.o \
 	fork-child.o proc-service.o thread-db.o lin-lwp.o gcore.o \
 	linux-nat.o
 
+# The dynamically loaded libthread_db needs access to symbols in the
+# gdb executable.
 LOADLIBES = -ldl -rdynamic
 
 # doublest.c currently assumes some properties of FP arithmetic
diff --git a/gdb/config/alpha/alpha-linux.mt b/gdb/config/alpha/alpha-linux.mt
index 8fe98f264b7..d07dbee41f2 100644
--- a/gdb/config/alpha/alpha-linux.mt
+++ b/gdb/config/alpha/alpha-linux.mt
@@ -1,4 +1,4 @@
 # Target: Little-endian Alpha
 TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
 	   solib.o solib-svr4.o solib-legacy.o
-TM_FILE= tm-alphalinux.h
+DEPRECATED_TM_FILE= tm-alphalinux.h
diff --git a/gdb/config/alpha/alpha-osf1.mh b/gdb/config/alpha/alpha-osf1.mh
index 6d53b44505b..837f73ca227 100644
--- a/gdb/config/alpha/alpha-osf1.mh
+++ b/gdb/config/alpha/alpha-osf1.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-1.x
-XM_FILE= xm-alphaosf.h
 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-osf1.mt b/gdb/config/alpha/alpha-osf1.mt
index 2a47bd41429..d8e227da6bf 100644
--- a/gdb/config/alpha/alpha-osf1.mt
+++ b/gdb/config/alpha/alpha-osf1.mt
@@ -1,3 +1,3 @@
 # Target: Little-endian Alpha
 TDEPFILES= alpha-tdep.o alpha-osf1-tdep.o alpha-mdebug-tdep.o
-TM_FILE= tm-alpha.h
+DEPRECATED_TM_FILE= tm-alpha.h
diff --git a/gdb/config/alpha/alpha-osf2.mh b/gdb/config/alpha/alpha-osf2.mh
index b853ebb30a9..d861037e60c 100644
--- a/gdb/config/alpha/alpha-osf2.mh
+++ b/gdb/config/alpha/alpha-osf2.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-2.x using procfs
-XM_FILE= xm-alphaosf.h
 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 \
diff --git a/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh
index f074444fae0..5a8f2aa04c8 100644
--- a/gdb/config/alpha/alpha-osf3.mh
+++ b/gdb/config/alpha/alpha-osf3.mh
@@ -1,5 +1,4 @@
 # Host: Little-endian Alpha running OSF/1-3.x and higher using procfs
-XM_FILE= xm-alphaosf.h
 NAT_FILE= nm-osf3.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 \
diff --git a/gdb/config/alpha/alpha.mt b/gdb/config/alpha/alpha.mt
index dfff657cbcc..703f3fb5e0b 100644
--- a/gdb/config/alpha/alpha.mt
+++ b/gdb/config/alpha/alpha.mt
@@ -1,2 +1,2 @@
 TDEPFILES= alpha-tdep.o
-TM_FILE= tm-alpha.h
+DEPRECATED_TM_FILE= tm-alpha.h
diff --git a/gdb/config/alpha/fbsd.mt b/gdb/config/alpha/fbsd.mt
index b126c682292..7c6892d29f1 100644
--- a/gdb/config/alpha/fbsd.mt
+++ b/gdb/config/alpha/fbsd.mt
@@ -1,3 +1,3 @@
 # Target: FreeBSD/alpha
 TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o alphafbsd-tdep.o
-TM_FILE= tm-alpha.h
+DEPRECATED_TM_FILE= tm-alpha.h
diff --git a/gdb/config/alpha/nbsd.mt b/gdb/config/alpha/nbsd.mt
index 065a28c9a01..6a8b9c01501 100644
--- a/gdb/config/alpha/nbsd.mt
+++ b/gdb/config/alpha/nbsd.mt
@@ -1,4 +1,4 @@
 # Target: Alpha running NetBSD
 TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o alphanbsd-tdep.o \
 	corelow.o nbsd-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index a6f9a49f9d6..19589584b20 100644
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -29,14 +29,6 @@
 
 #define U_REGS_OFFSET 0
 
-/* FIXME: This is probably true, or should be, on all GNU/Linux ports.
-   IA64?  Sparc64?  */
-#define PTRACE_ARG3_TYPE long
-
-/* ptrace transfers longs, the ptrace man page is lying.  */
-
-#define PTRACE_XFER_TYPE long
-
 /* The alpha does not step over a breakpoint, the manpage is lying again.  */
 
 #define CANNOT_STEP_BREAKPOINT 1
diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
index 326bb3005ca..288bc352dcb 100644
--- a/gdb/config/alpha/nm-osf.h
+++ b/gdb/config/alpha/nm-osf.h
@@ -29,10 +29,6 @@
 
 #define U_REGS_OFFSET 0
 
-/* FIXME: Shouldn't the default definition in inferior.h be int* ? */
-
-#define PTRACE_ARG3_TYPE int*
-
 /* ptrace transfers longs, the ptrace man page is lying.  */
 
 #define PTRACE_XFER_TYPE long
diff --git a/gdb/config/alpha/nm-osf2.h b/gdb/config/alpha/nm-osf2.h
index 1f3932df59b..cbd232c0834 100644
--- a/gdb/config/alpha/nm-osf2.h
+++ b/gdb/config/alpha/nm-osf2.h
@@ -35,7 +35,6 @@
 #define PROCFS_DONT_TRACE_FAULTS
 
 /* Work around some peculiarities in the OSF/1 procfs implementation.  */
-#define PROCFS_SIGPEND_OFFSET
 #define PROCFS_NEED_PIOCSSIG_FOR_KILL
 #define PROCFS_DONT_PIOCSSIG_CURSIG
 
@@ -43,10 +42,3 @@
 
 #define KERNEL_U_SIZE kernel_u_size()
 extern int kernel_u_size (void);
-
-/* poll() doesn't seem to work properly for /proc in this version of the OS.
-   If we only specify POLLPRI, things hang.  It seems to get better when we set
-   POLLOUT, but that always returns POLLNVAL!!!  Also, POLLOUT causes problems
-   on other OSes.  */
-
-#define LOSING_POLL
diff --git a/gdb/config/alpha/xm-alphalinux.h b/gdb/config/alpha/xm-alphalinux.h
deleted file mode 100644
index f1bc14da4bd..00000000000
--- a/gdb/config/alpha/xm-alphalinux.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Host definitions for GDB running on an Alpha under GNU/Linux.
-
-   Copyright 1996, 2001, 2002 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.  */
-
-/* The alpha has no siginterrupt routine.  */
-#define NO_SIGINTERRUPT
-
-#define HAVE_TERMIOS
-#define USG
diff --git a/gdb/config/alpha/xm-alphaosf.h b/gdb/config/alpha/xm-alphaosf.h
deleted file mode 100644
index 67d3cc4af8a..00000000000
--- a/gdb/config/alpha/xm-alphaosf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Host definitions for GDB running on an alpha under OSF/1
-   Copyright 1992, 1993, 1996 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.  */
-
-/* The alpha has no siginterrupt routine.  */
-#define NO_SIGINTERRUPT
-
-#define HAVE_TERMIOS