Index: ChangeLog

2004-09-13  Andrew Cagney  <cagney@gnu.org>

	* configure.in (frags): Replace TM_FILE with DEPRECATED_TM_FILE.
	* configure: Re-generate.
	* nlm/Makefile.in (TAGS): Update.
	* Makefile.in (TAGS): Update.
	* config/vax/nbsd.mt (TM_FILE): Update.
	* config/sparc/vxworks.mt (TM_FILE): Update.
	* config/sparc/sol2.mt (TM_FILE): Update.
	* config/sparc/sol2-64.mt (TM_FILE): Update.
	* config/sparc/obsd64.mt (TM_FILE): Update.
	* config/sparc/obsd.mt (TM_FILE): Update.
	* config/sparc/nbsd64.mt (TM_FILE): Update.
	* config/sparc/nbsd.mt (TM_FILE): Update.
	* config/sparc/linux64.mt (TM_FILE): Update.
	* config/sparc/linux.mt (TM_FILE): Update.
	* config/sparc/fbsd.mt (TM_FILE): Update.
	* config/sh/wince.mt (TM_FILE): Update.
	* config/sh/nbsd.mt (TM_FILE): Update.
	* config/sh/linux.mt (TM_FILE): Update.
	* config/sh/embed.mt (TM_FILE): Update.
	* config/s390/s390.mt (TM_FILE): Update.
	* config/rs6000/rs6000lynx.mt (TM_FILE): Update.
	* config/rs6000/rs6000.mt (TM_FILE): Update.
	* config/rs6000/aix4.mt (TM_FILE): Update.
	* config/powerpc/vxworks.mt (TM_FILE): Update.
	* config/powerpc/ppc-sim.mt (TM_FILE): Update.
	* config/powerpc/ppc-eabi.mt (TM_FILE): Update.
	* config/powerpc/obsd.mt (TM_FILE): Update.
	* config/powerpc/nbsd.mt (TM_FILE): Update.
	* config/powerpc/linux.mt (TM_FILE): Update.
	* config/powerpc/aix.mt (TM_FILE): Update.
	* config/pa/obsd.mt (TM_FILE): Update.
	* config/pa/linux.mt (TM_FILE): Update.
	* config/pa/hppahpux.mt (TM_FILE): Update.
	* config/pa/hppa64.mt (TM_FILE): Update.
	* config/pa/hppa.mt (TM_FILE): Update.
	* config/ns32k/nbsdaout.mt (TM_FILE): Update.
	* config/mips/wince.mt (TM_FILE): Update.
	* config/mips/vxmips.mt (TM_FILE): Update.
	* config/mips/nbsd.mt (TM_FILE): Update.
	* config/mips/linux.mt (TM_FILE): Update.
	* config/mips/irix6.mt (TM_FILE): Update.
	* config/mips/irix5.mt (TM_FILE): Update.
	* config/mips/embed.mt (TM_FILE): Update.
	* config/m68k/vxworks68.mt (TM_FILE): Update.
	* config/m68k/st2000.mt (TM_FILE): Update.
	* config/m68k/os68k.mt (TM_FILE): Update.
	* config/m68k/obsd.mt (TM_FILE): Update.
	* config/m68k/nbsd.mt (TM_FILE): Update.
	* config/m68k/monitor.mt (TM_FILE): Update.
	* config/m68k/linux.mt (TM_FILE): Update.
	* config/m68k/cisco.mt (TM_FILE): Update.
	* config/ia64/linux.mt (TM_FILE): Update.
	* config/ia64/aix.mt (TM_FILE): Update.
	* config/ia64/ia64.mt (TM_FILE): Update.
	* config/i386/vxworks.mt (TM_FILE): Update.
	* config/i386/obsd64.mt (TM_FILE): Update.
	* config/i386/obsd.mt (TM_FILE): Update.
	* config/i386/nto.mt (TM_FILE): Update.
	* config/i386/nbsd64.mt (TM_FILE): Update.
	* config/i386/nbsd.mt (TM_FILE): Update.
	* config/i386/linux64.mt (TM_FILE): Update.
	* config/i386/linux.mt (TM_FILE): Update.
	* config/i386/i386sol2.mt (TM_FILE): Update.
	* config/i386/i386lynx.mt (TM_FILE): Update.
	* config/i386/fbsd64.mt (TM_FILE): Update.
	* config/i386/fbsd.mt (TM_FILE): Update.
	* config/i386/cygwin.mt (TM_FILE): Update.
	* config/h8300/h8300.mt (TM_FILE): Update.
	* config/frv/frv.mt (TM_FILE): Update.
	* config/cris/cris.mt (TM_FILE): Update.
	* config/arm/wince.mt (TM_FILE): Update.
	* config/arm/nbsd.mt (TM_FILE): Update.
	* config/arm/linux.mt (TM_FILE): Update.
	* config/arm/embed.mt (TM_FILE): Update.
	* config/alpha/nbsd.mt (TM_FILE): Update.
	* config/alpha/fbsd.mt (TM_FILE): Update.
	* config/alpha/alpha.mt (TM_FILE): Update.
	* config/alpha/alpha-osf1.mt (TM_FILE): Update.
	* config/alpha/alpha-linux.mt (TM_FILE): Update.

Index: gdbserver/ChangeLog
2004-09-02  Andrew Cagney  <cagney@gnu.org>

	* Makefile.in (TAGS): Replace TM_FILE with DEPRECATED_TM_FILE.

80 files changed, 171 insertions, 86 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84bd986..43cdb4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,85 @@
 2004-09-13  Andrew Cagney  <cagney@gnu.org>
 
+	* configure.in (frags): Replace TM_FILE with DEPRECATED_TM_FILE.
+	* configure: Re-generate.
+	* nlm/Makefile.in (TAGS): Update.
+	* Makefile.in (TAGS): Update.
+	* config/vax/nbsd.mt (TM_FILE): Update.
+	* config/sparc/vxworks.mt (TM_FILE): Update.
+	* config/sparc/sol2.mt (TM_FILE): Update.
+	* config/sparc/sol2-64.mt (TM_FILE): Update.
+	* config/sparc/obsd64.mt (TM_FILE): Update.
+	* config/sparc/obsd.mt (TM_FILE): Update.
+	* config/sparc/nbsd64.mt (TM_FILE): Update.
+	* config/sparc/nbsd.mt (TM_FILE): Update.
+	* config/sparc/linux64.mt (TM_FILE): Update.
+	* config/sparc/linux.mt (TM_FILE): Update.
+	* config/sparc/fbsd.mt (TM_FILE): Update.
+	* config/sh/wince.mt (TM_FILE): Update.
+	* config/sh/nbsd.mt (TM_FILE): Update.
+	* config/sh/linux.mt (TM_FILE): Update.
+	* config/sh/embed.mt (TM_FILE): Update.
+	* config/s390/s390.mt (TM_FILE): Update.
+	* config/rs6000/rs6000lynx.mt (TM_FILE): Update.
+	* config/rs6000/rs6000.mt (TM_FILE): Update.
+	* config/rs6000/aix4.mt (TM_FILE): Update.
+	* config/powerpc/vxworks.mt (TM_FILE): Update.
+	* config/powerpc/ppc-sim.mt (TM_FILE): Update.
+	* config/powerpc/ppc-eabi.mt (TM_FILE): Update.
+	* config/powerpc/obsd.mt (TM_FILE): Update.
+	* config/powerpc/nbsd.mt (TM_FILE): Update.
+	* config/powerpc/linux.mt (TM_FILE): Update.
+	* config/powerpc/aix.mt (TM_FILE): Update.
+	* config/pa/obsd.mt (TM_FILE): Update.
+	* config/pa/linux.mt (TM_FILE): Update.
+	* config/pa/hppahpux.mt (TM_FILE): Update.
+	* config/pa/hppa64.mt (TM_FILE): Update.
+	* config/pa/hppa.mt (TM_FILE): Update.
+	* config/ns32k/nbsdaout.mt (TM_FILE): Update.
+	* config/mips/wince.mt (TM_FILE): Update.
+	* config/mips/vxmips.mt (TM_FILE): Update.
+	* config/mips/nbsd.mt (TM_FILE): Update.
+	* config/mips/linux.mt (TM_FILE): Update.
+	* config/mips/irix6.mt (TM_FILE): Update.
+	* config/mips/irix5.mt (TM_FILE): Update.
+	* config/mips/embed.mt (TM_FILE): Update.
+	* config/m68k/vxworks68.mt (TM_FILE): Update.
+	* config/m68k/st2000.mt (TM_FILE): Update.
+	* config/m68k/os68k.mt (TM_FILE): Update.
+	* config/m68k/obsd.mt (TM_FILE): Update.
+	* config/m68k/nbsd.mt (TM_FILE): Update.
+	* config/m68k/monitor.mt (TM_FILE): Update.
+	* config/m68k/linux.mt (TM_FILE): Update.
+	* config/m68k/cisco.mt (TM_FILE): Update.
+	* config/ia64/linux.mt (TM_FILE): Update.
+	* config/ia64/aix.mt (TM_FILE): Update.
+	* config/ia64/ia64.mt (TM_FILE): Update.
+	* config/i386/vxworks.mt (TM_FILE): Update.
+	* config/i386/obsd64.mt (TM_FILE): Update.
+	* config/i386/obsd.mt (TM_FILE): Update.
+	* config/i386/nto.mt (TM_FILE): Update.
+	* config/i386/nbsd64.mt (TM_FILE): Update.
+	* config/i386/nbsd.mt (TM_FILE): Update.
+	* config/i386/linux64.mt (TM_FILE): Update.
+	* config/i386/linux.mt (TM_FILE): Update.
+	* config/i386/i386sol2.mt (TM_FILE): Update.
+	* config/i386/i386lynx.mt (TM_FILE): Update.
+	* config/i386/fbsd64.mt (TM_FILE): Update.
+	* config/i386/fbsd.mt (TM_FILE): Update.
+	* config/i386/cygwin.mt (TM_FILE): Update.
+	* config/h8300/h8300.mt (TM_FILE): Update.
+	* config/frv/frv.mt (TM_FILE): Update.
+	* config/cris/cris.mt (TM_FILE): Update.
+	* config/arm/wince.mt (TM_FILE): Update.
+	* config/arm/nbsd.mt (TM_FILE): Update.
+	* config/arm/linux.mt (TM_FILE): Update.
+	* config/arm/embed.mt (TM_FILE): Update.
+	* config/alpha/nbsd.mt (TM_FILE): Update.
+	* config/alpha/fbsd.mt (TM_FILE): Update.
+	* config/alpha/alpha.mt (TM_FILE): Update.
+	* config/alpha/alpha-osf1.mt (TM_FILE): Update.
+	* config/alpha/alpha-linux.mt (TM_FILE): Update.
+
 	Eliminate event_loop_p, always has the value 1.
 	* defs.h (event_loop_p): Delete macro.
 	* breakpoint.c (until_break_command): Simplify.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a8fcd73..7ad1e9b 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1202,7 +1202,7 @@ gdb1$(EXEEXT): gdb$(EXEEXT)
 
 TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
 	@echo Making TAGS
-	@etags $(srcdir)/$(TM_FILE) \
+	@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
 	  $(srcdir)/$(XM_FILE) \
 	  $(srcdir)/$(NAT_FILE) \
 	`(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
diff --git a/gdb/config/alpha/alpha-linux.mt b/gdb/config/alpha/alpha-linux.mt
index 8fe98f2..d07dbee 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.mt b/gdb/config/alpha/alpha-osf1.mt
index 2a47bd4..d8e227d 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.mt b/gdb/config/alpha/alpha.mt
index dfff657..703f3fb 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 b126c68..7c6892d 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 065a28c..6a8b9c0 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/arm/embed.mt b/gdb/config/arm/embed.mt
index c854d17..f826bc9 100644
--- a/gdb/config/arm/embed.mt
+++ b/gdb/config/arm/embed.mt
@@ -1,7 +1,7 @@
 # Target: ARM embedded system
 TDEPFILES= arm-tdep.o remote-rdp.o remote-rdi.o
 TDEPLIBS= rdi-share/libangsd.a
-TM_FILE= tm-embed.h
+DEPRECATED_TM_FILE= tm-embed.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/arm/libsim.a
diff --git a/gdb/config/arm/linux.mt b/gdb/config/arm/linux.mt
index cd6f010..a2439f8 100644
--- a/gdb/config/arm/linux.mt
+++ b/gdb/config/arm/linux.mt
@@ -1,3 +1,3 @@
 # Target: ARM based machine running GNU/Linux
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
 TDEPFILES= arm-tdep.o arm-linux-tdep.o glibc-tdep.o solib.o solib-svr4.o solib-legacy.o
diff --git a/gdb/config/arm/nbsd.mt b/gdb/config/arm/nbsd.mt
index 5754292..e9dd0d0 100644
--- a/gdb/config/arm/nbsd.mt
+++ b/gdb/config/arm/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: ARM running NetBSD
 TDEPFILES= arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o nbsd-tdep.o
-TM_FILE=solib.h
+DEPRECATED_TM_FILE=solib.h
diff --git a/gdb/config/arm/wince.mt b/gdb/config/arm/wince.mt
index 92a77ae..9cdc07d 100644
--- a/gdb/config/arm/wince.mt
+++ b/gdb/config/arm/wince.mt
@@ -1,5 +1,5 @@
 # Target: Acorn RISC machine (ARM) with simulator
 TDEPFILES= arm-tdep.o wince.o
-TM_FILE= tm-wince.h
+DEPRECATED_TM_FILE= tm-wince.h
 MT_CFLAGS=-DARM -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
 TM_CLIBS=-lrapi
diff --git a/gdb/config/cris/cris.mt b/gdb/config/cris/cris.mt
index 9a9cf7b..9f91915 100644
--- a/gdb/config/cris/cris.mt
+++ b/gdb/config/cris/cris.mt
@@ -1,2 +1,2 @@
 TDEPFILES= cris-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/frv/frv.mt b/gdb/config/frv/frv.mt
index 5849f04..3ce8983 100644
--- a/gdb/config/frv/frv.mt
+++ b/gdb/config/frv/frv.mt
@@ -1,5 +1,5 @@
 # Target: Fujitsu FRV processor
 TDEPFILES= frv-tdep.o frv-linux-tdep.o solib.o solib-frv.o
-TM_FILE= tm-frv.h
+DEPRECATED_TM_FILE= tm-frv.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/frv/libsim.a
diff --git a/gdb/config/h8300/h8300.mt b/gdb/config/h8300/h8300.mt
index c6e25ab..4d27efc 100644
--- a/gdb/config/h8300/h8300.mt
+++ b/gdb/config/h8300/h8300.mt
@@ -1,6 +1,6 @@
 # Target: H8300 with HMS monitor, E7000 ICE and H8 simulator
 TDEPFILES= h8300-tdep.o remote-e7000.o ser-e7kpc.o monitor.o remote-hms.o dsrec.o
-TM_FILE= tm-h8300.h
+DEPRECATED_TM_FILE= tm-h8300.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/h8300/libsim.a
diff --git a/gdb/config/i386/cygwin.mt b/gdb/config/i386/cygwin.mt
index 6c16345..745b13a 100644
--- a/gdb/config/i386/cygwin.mt
+++ b/gdb/config/i386/cygwin.mt
@@ -1,6 +1,6 @@
 # Target: Intel 386 run win32
 TDEPFILES= i386-tdep.o i386-cygwin-tdep.o i387-tdep.o
-TM_FILE= tm-cygwin.h
+DEPRECATED_TM_FILE= tm-cygwin.h
 
 
 
diff --git a/gdb/config/i386/fbsd.mt b/gdb/config/i386/fbsd.mt
index ceda239..1a69e7f 100644
--- a/gdb/config/i386/fbsd.mt
+++ b/gdb/config/i386/fbsd.mt
@@ -1,4 +1,4 @@
 # Target: FreeBSD/i386
 TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt
index d077703..07fbf5a 100644
--- a/gdb/config/i386/fbsd64.mt
+++ b/gdb/config/i386/fbsd64.mt
@@ -2,4 +2,5 @@
 TDEPFILES= amd64-tdep.o amd64fbsd-tdep.o \
 	i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
+
diff --git a/gdb/config/i386/i386lynx.mt b/gdb/config/i386/i386lynx.mt
index 30ad473..fe56c72 100644
--- a/gdb/config/i386/i386lynx.mt
+++ b/gdb/config/i386/i386lynx.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running LynxOS
 TDEPFILES= coff-solib.o i386-tdep.o i386ly-tdep.o
-TM_FILE= config/tm-lynx.h
+DEPRECATED_TM_FILE= config/tm-lynx.h
diff --git a/gdb/config/i386/i386sol2.mt b/gdb/config/i386/i386sol2.mt
index 1ced287..800ecba 100644
--- a/gdb/config/i386/i386sol2.mt
+++ b/gdb/config/i386/i386sol2.mt
@@ -1,4 +1,4 @@
 # Target: Solaris x86
 TDEPFILES= i386-tdep.o i387-tdep.o i386-sol2-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-i386sol2.h
+DEPRECATED_TM_FILE= tm-i386sol2.h
diff --git a/gdb/config/i386/linux.mt b/gdb/config/i386/linux.mt
index 522453f..3fce56a 100644
--- a/gdb/config/i386/linux.mt
+++ b/gdb/config/i386/linux.mt
@@ -1,4 +1,4 @@
 # Target: Intel 386 running GNU/Linux
 TDEPFILES= i386-tdep.o i386-linux-tdep.o glibc-tdep.o i387-tdep.o \
 	solib.o solib-svr4.o symfile-mem.o
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt
index 64baa35..5a4aca1 100644
--- a/gdb/config/i386/linux64.mt
+++ b/gdb/config/i386/linux64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= amd64-tdep.o amd64-linux-tdep.o \
 	i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
 	solib.o solib-svr4.o corelow.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt
index ce82c3b..583ef67 100644
--- a/gdb/config/i386/nbsd.mt
+++ b/gdb/config/i386/nbsd.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/i386
 TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt
index 72eb556..f33d659 100644
--- a/gdb/config/i386/nbsd64.mt
+++ b/gdb/config/i386/nbsd64.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/amd64
 TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/nto.mt b/gdb/config/i386/nto.mt
index 6655f3e..e9d1431 100644
--- a/gdb/config/i386/nto.mt
+++ b/gdb/config/i386/nto.mt
@@ -1,4 +1,4 @@
 # Target: Intel 386 running qnx6.
 TDEPFILES = i386-tdep.o i387-tdep.o corelow.o solib.o solib-svr4.o \
 	i386-nto-tdep.o nto-tdep.o remote-nto.o
-TM_FILE = tm-nto.h
+DEPRECATED_TM_FILE = tm-nto.h
diff --git a/gdb/config/i386/obsd.mt b/gdb/config/i386/obsd.mt
index b8c40b8..b90fbf3 100644
--- a/gdb/config/i386/obsd.mt
+++ b/gdb/config/i386/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/i386
 TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt
index 2b94e6f..4b1d144 100644
--- a/gdb/config/i386/obsd64.mt
+++ b/gdb/config/i386/obsd64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= amd64-tdep.o amd64obsd-tdep.o \
 	i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/i386/vxworks.mt b/gdb/config/i386/vxworks.mt
index f110db0..7994afe 100644
--- a/gdb/config/i386/vxworks.mt
+++ b/gdb/config/i386/vxworks.mt
@@ -1,3 +1,3 @@
 # Target: i386 running VxWorks
 TDEPFILES= i386-tdep.o i387-tdep.o 
-TM_FILE= config/tm-vxworks.h
+DEPRECATED_TM_FILE= config/tm-vxworks.h
diff --git a/gdb/config/ia64/aix.mt b/gdb/config/ia64/aix.mt
index 0348146..658bee3 100644
--- a/gdb/config/ia64/aix.mt
+++ b/gdb/config/ia64/aix.mt
@@ -1,4 +1,4 @@
 # Target: Intel IA-64 running AIX
 
 TDEPFILES= ia64-tdep.o ia64-linux-tdep.o ia64-aix-tdep.o
-TM_FILE= tm-aix.h
+DEPRECATED_TM_FILE= tm-aix.h
diff --git a/gdb/config/ia64/ia64.mt b/gdb/config/ia64/ia64.mt
index c0f85a4..2f9237a 100644
--- a/gdb/config/ia64/ia64.mt
+++ b/gdb/config/ia64/ia64.mt
@@ -1,2 +1,2 @@
 TDEPFILES= ia64-tdep.o
-TM_FILE= tm-ia64.h
+DEPRECATED_TM_FILE= tm-ia64.h
diff --git a/gdb/config/ia64/linux.mt b/gdb/config/ia64/linux.mt
index 3a661b3..bdb286c 100644
--- a/gdb/config/ia64/linux.mt
+++ b/gdb/config/ia64/linux.mt
@@ -1,4 +1,4 @@
 # Target: Intel IA-64 running GNU/Linux
 TDEPFILES= ia64-tdep.o ia64-aix-tdep.o ia64-linux-tdep.o \
 	solib.o solib-svr4.o solib-legacy.o
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
diff --git a/gdb/config/m68k/cisco.mt b/gdb/config/m68k/cisco.mt
index bc2e921..85b4633 100644
--- a/gdb/config/m68k/cisco.mt
+++ b/gdb/config/m68k/cisco.mt
@@ -1,3 +1,3 @@
 # Target: Cisco Router with 68K processor
 TDEPFILES= m68k-tdep.o corelow.o core-aout.o
-TM_FILE= tm-cisco.h
+DEPRECATED_TM_FILE= tm-cisco.h
diff --git a/gdb/config/m68k/linux.mt b/gdb/config/m68k/linux.mt
index 75e5db2..262f67b 100644
--- a/gdb/config/m68k/linux.mt
+++ b/gdb/config/m68k/linux.mt
@@ -1,3 +1,3 @@
 # Target: Motorola m68k with a.out and ELF
 TDEPFILES= m68k-tdep.o m68klinux-tdep.o solib.o solib-svr4.o solib-legacy.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/m68k/monitor.mt b/gdb/config/m68k/monitor.mt
index 46b1c55..0cae796 100644
--- a/gdb/config/m68k/monitor.mt
+++ b/gdb/config/m68k/monitor.mt
@@ -1,3 +1,3 @@
 # Target: Motorola m68k embedded (EST emulator, rom68k and bug monitors)
 TDEPFILES= m68k-tdep.o monitor.o remote-est.o cpu32bug-rom.o rom68k-rom.o abug-rom.o dbug-rom.o dsrec.o
-TM_FILE= tm-monitor.h
+DEPRECATED_TM_FILE= tm-monitor.h
diff --git a/gdb/config/m68k/nbsd.mt b/gdb/config/m68k/nbsd.mt
index 099c0e9..db3e357 100644
--- a/gdb/config/m68k/nbsd.mt
+++ b/gdb/config/m68k/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: NetBSD/m68k
 TDEPFILES= m68k-tdep.o m68kbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/m68k/obsd.mt b/gdb/config/m68k/obsd.mt
index 18acf5e..9853121 100644
--- a/gdb/config/m68k/obsd.mt
+++ b/gdb/config/m68k/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/m68k
 TDEPFILES= m68k-tdep.o m68kbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/m68k/os68k.mt b/gdb/config/m68k/os68k.mt
index 391dd89..e1a4344 100644
--- a/gdb/config/m68k/os68k.mt
+++ b/gdb/config/m68k/os68k.mt
@@ -1,3 +1,3 @@
 # Target: VxWorks running on a 68000
 TDEPFILES= m68k-tdep.o
-TM_FILE= tm-os68k.h
+DEPRECATED_TM_FILE= tm-os68k.h
diff --git a/gdb/config/m68k/vxworks68.mt b/gdb/config/m68k/vxworks68.mt
index 8c97744..e396f62 100644
--- a/gdb/config/m68k/vxworks68.mt
+++ b/gdb/config/m68k/vxworks68.mt
@@ -1,3 +1,3 @@
 # Target: Motorola m68k running VxWorks
 TDEPFILES= m68k-tdep.o remote-vx.o remote-vx68.o xdr_ld.o xdr_ptrace.o xdr_rdb.o
-TM_FILE= tm-vx68.h
+DEPRECATED_TM_FILE= tm-vx68.h
diff --git a/gdb/config/mips/embed.mt b/gdb/config/mips/embed.mt
index 3dad52b..c1cabfe 100644
--- a/gdb/config/mips/embed.mt
+++ b/gdb/config/mips/embed.mt
@@ -1,4 +1,4 @@
 TDEPFILES= mips-tdep.o remote-mips.o
-TM_FILE= tm-mips.h
+DEPRECATED_TM_FILE= tm-mips.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/irix5.mt b/gdb/config/mips/irix5.mt
index 4a9e748..5699589 100644
--- a/gdb/config/mips/irix5.mt
+++ b/gdb/config/mips/irix5.mt
@@ -1,3 +1,3 @@
 # Target: MIPS SGI running Irix 5
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-TM_FILE= tm-mips.h
+DEPRECATED_TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/irix6.mt b/gdb/config/mips/irix6.mt
index 9143be2..dde6a07 100644
--- a/gdb/config/mips/irix6.mt
+++ b/gdb/config/mips/irix6.mt
@@ -1,3 +1,3 @@
 # Target: MIPS SGI running Irix 6.x
 TDEPFILES= mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o
-TM_FILE= tm-mips.h
+DEPRECATED_TM_FILE= tm-mips.h
diff --git a/gdb/config/mips/linux.mt b/gdb/config/mips/linux.mt
index 25d99b3..bcad141 100644
--- a/gdb/config/mips/linux.mt
+++ b/gdb/config/mips/linux.mt
@@ -1,7 +1,7 @@
 # Target: Linux/MIPS
 TDEPFILES= mips-tdep.o mips-linux-tdep.o corelow.o \
 	solib.o solib-svr4.o
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/nbsd.mt b/gdb/config/mips/nbsd.mt
index eb5d887..119a7f0 100644
--- a/gdb/config/mips/nbsd.mt
+++ b/gdb/config/mips/nbsd.mt
@@ -1,7 +1,7 @@
 # Target: MIPS running NetBSD
 TDEPFILES= mips-tdep.o mipsnbsd-tdep.o corelow.o solib.o solib-svr4.o \
 	nbsd-tdep.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/vxmips.mt b/gdb/config/mips/vxmips.mt
index a20cf96..1fa4338 100644
--- a/gdb/config/mips/vxmips.mt
+++ b/gdb/config/mips/vxmips.mt
@@ -1,3 +1,3 @@
 # Target: MIPS running VxWorks
 TDEPFILES= mips-tdep.o remote-vx.o remote-vxmips.o xdr_ld.o xdr_ptrace.o xdr_rdb.o
-TM_FILE= tm-vxmips.h
+DEPRECATED_TM_FILE= tm-vxmips.h
diff --git a/gdb/config/mips/wince.mt b/gdb/config/mips/wince.mt
index 6aa5733..82ec9ff 100644
--- a/gdb/config/mips/wince.mt
+++ b/gdb/config/mips/wince.mt
@@ -1,5 +1,5 @@
 # Target: Little-endian MIPS machine such as DECstation.
 TDEPFILES= mips-tdep.o wince.o
-TM_FILE= tm-wince.h
+DEPRECATED_TM_FILE= tm-wince.h
 MT_CFLAGS=-DMIPS -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
 TM_CLIBS=-lrapi
diff --git a/gdb/config/ns32k/nbsdaout.mt b/gdb/config/ns32k/nbsdaout.mt
index e2d68d0..130c260 100644
--- a/gdb/config/ns32k/nbsdaout.mt
+++ b/gdb/config/ns32k/nbsdaout.mt
@@ -1,3 +1,3 @@
 # Target: PC532 running NetBSD
 TDEPFILES= ns32k-tdep.o ns32knbsd-tdep.o
-TM_FILE= tm-ns32k.h
+DEPRECATED_TM_FILE= tm-ns32k.h
diff --git a/gdb/config/pa/hppa.mt b/gdb/config/pa/hppa.mt
index be77892..5ba51fa 100644
--- a/gdb/config/pa/hppa.mt
+++ b/gdb/config/pa/hppa.mt
@@ -1,2 +1,2 @@
 TDEPFILES= hppa-tdep.o
-TM_FILE= tm-hppa.h
+DEPRECATED_TM_FILE= tm-hppa.h
diff --git a/gdb/config/pa/hppa64.mt b/gdb/config/pa/hppa64.mt
index 10d9fc6..f7baa4a 100644
--- a/gdb/config/pa/hppa64.mt
+++ b/gdb/config/pa/hppa64.mt
@@ -1,3 +1,3 @@
 # Target: HP PA-RISC 2.0 running HPUX 11.00 in wide mode
 TDEPFILES= hppa-tdep.o hppa-hpux-tdep.o
-TM_FILE= tm-hppa64.h
+DEPRECATED_TM_FILE= tm-hppa64.h
diff --git a/gdb/config/pa/hppahpux.mt b/gdb/config/pa/hppahpux.mt
index 806e91c..f997d89 100644
--- a/gdb/config/pa/hppahpux.mt
+++ b/gdb/config/pa/hppahpux.mt
@@ -1,3 +1,3 @@
 # Target: HP PA-RISC running hpux
 TDEPFILES= hppa-tdep.o hppa-hpux-tdep.o
-TM_FILE= tm-hppah.h
+DEPRECATED_TM_FILE= tm-hppah.h
diff --git a/gdb/config/pa/linux.mt b/gdb/config/pa/linux.mt
index e764107..d216866 100644
--- a/gdb/config/pa/linux.mt
+++ b/gdb/config/pa/linux.mt
@@ -1,3 +1,3 @@
 # Target: HP PA-RISC running Linux
 TDEPFILES= hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o solib.o solib-svr4.o
-TM_FILE=tm-linux.h
+DEPRECATED_TM_FILE=tm-linux.h
diff --git a/gdb/config/pa/obsd.mt b/gdb/config/pa/obsd.mt
index 6366f64..b7a6888 100644
--- a/gdb/config/pa/obsd.mt
+++ b/gdb/config/pa/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/hppa
 TDEPFILES= hppa-tdep.o hppabsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/powerpc/aix.mt b/gdb/config/powerpc/aix.mt
index 240d5ce..b736d5a 100644
--- a/gdb/config/powerpc/aix.mt
+++ b/gdb/config/powerpc/aix.mt
@@ -1,3 +1,3 @@
 # Target: PowerPC running AIX
 TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= config/rs6000/tm-rs6000.h
+DEPRECATED_TM_FILE= config/rs6000/tm-rs6000.h
diff --git a/gdb/config/powerpc/linux.mt b/gdb/config/powerpc/linux.mt
index 1fb6fd8..61a9dcd 100644
--- a/gdb/config/powerpc/linux.mt
+++ b/gdb/config/powerpc/linux.mt
@@ -1,7 +1,7 @@
 # Target: Motorola PPC on Linux
 TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \
 	solib-svr4.o solib-legacy.o corelow.o
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/powerpc/nbsd.mt b/gdb/config/powerpc/nbsd.mt
index a1091f3..2f50c21 100644
--- a/gdb/config/powerpc/nbsd.mt
+++ b/gdb/config/powerpc/nbsd.mt
@@ -1,7 +1,7 @@
 # Target: PowerPC, running NetBSD
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o nbsd-tdep.o corelow.o \
 	solib.o solib-svr4.o
-TM_FILE= tm-ppc-eabi.h
+DEPRECATED_TM_FILE= tm-ppc-eabi.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/powerpc/obsd.mt b/gdb/config/powerpc/obsd.mt
index 4441832..a0adcdb 100644
--- a/gdb/config/powerpc/obsd.mt
+++ b/gdb/config/powerpc/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/powerpc
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcobsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
diff --git a/gdb/config/powerpc/ppc-eabi.mt b/gdb/config/powerpc/ppc-eabi.mt
index 5ef8cd9..eac4c14 100644
--- a/gdb/config/powerpc/ppc-eabi.mt
+++ b/gdb/config/powerpc/ppc-eabi.mt
@@ -1,3 +1,3 @@
 # Target: PowerPC running eabi
 TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-ppc-eabi.h
+DEPRECATED_TM_FILE= tm-ppc-eabi.h
diff --git a/gdb/config/powerpc/ppc-sim.mt b/gdb/config/powerpc/ppc-sim.mt
index 187bf39..3fc6883 100644
--- a/gdb/config/powerpc/ppc-sim.mt
+++ b/gdb/config/powerpc/ppc-sim.mt
@@ -1,6 +1,6 @@
 # Target: PowerPC running eabi and including the simulator
 TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-ppc-eabi.h
+DEPRECATED_TM_FILE= tm-ppc-eabi.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/powerpc/vxworks.mt b/gdb/config/powerpc/vxworks.mt
index eca028f..ae321f8 100644
--- a/gdb/config/powerpc/vxworks.mt
+++ b/gdb/config/powerpc/vxworks.mt
@@ -1,3 +1,3 @@
 # Target: Powerpc running VxWorks
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-vxworks.h
+DEPRECATED_TM_FILE= tm-vxworks.h
diff --git a/gdb/config/rs6000/aix4.mt b/gdb/config/rs6000/aix4.mt
index 4c56038..0729ffa 100644
--- a/gdb/config/rs6000/aix4.mt
+++ b/gdb/config/rs6000/aix4.mt
@@ -1,3 +1,3 @@
 # Target: IBM RS/6000 running AIX4
 TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= config/rs6000/tm-rs6000.h
+DEPRECATED_TM_FILE= config/rs6000/tm-rs6000.h
diff --git a/gdb/config/rs6000/rs6000.mt b/gdb/config/rs6000/rs6000.mt
index 86b4c58..02c2230 100644
--- a/gdb/config/rs6000/rs6000.mt
+++ b/gdb/config/rs6000/rs6000.mt
@@ -1,3 +1,3 @@
 # Target: IBM RS/6000 running AIX
 TDEPFILES= rs6000-tdep.o xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-rs6000.h
+DEPRECATED_TM_FILE= tm-rs6000.h
diff --git a/gdb/config/rs6000/rs6000lynx.mt b/gdb/config/rs6000/rs6000lynx.mt
index 89ed7a2..200a647 100644
--- a/gdb/config/rs6000/rs6000lynx.mt
+++ b/gdb/config/rs6000/rs6000lynx.mt
@@ -1,3 +1,3 @@
 # Target: IBM RS6000 running LynxOS
 TDEPFILES= coff-solib.o rs6000-tdep.o ppc-sysv-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-rs6000ly.h
+DEPRECATED_TM_FILE= tm-rs6000ly.h
diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
index 2482dad..84eca83 100644
--- a/gdb/config/s390/s390.mt
+++ b/gdb/config/s390/s390.mt
@@ -1,5 +1,5 @@
 # Target: S390 running Linux
-TM_FILE= config/tm-linux.h
+DEPRECATED_TM_FILE= config/tm-linux.h
 TDEPFILES=s390-tdep.o solib.o
 # Post 5.0 tdep-files
 TDEPFILES+=solib-svr4.o solib-legacy.o
diff --git a/gdb/config/sh/embed.mt b/gdb/config/sh/embed.mt
index b2fcc18..65d8b59 100644
--- a/gdb/config/sh/embed.mt
+++ b/gdb/config/sh/embed.mt
@@ -1,6 +1,6 @@
 # Target: Embedded Renesas Super-H with ICE and simulator
 TDEPFILES= sh-tdep.o monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o dsrec.o 
-TM_FILE= tm-sh.h
+DEPRECATED_TM_FILE= tm-sh.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/linux.mt b/gdb/config/sh/linux.mt
index a18900b..332ce72 100644
--- a/gdb/config/sh/linux.mt
+++ b/gdb/config/sh/linux.mt
@@ -1,6 +1,6 @@
 # Target: Renesas Super-H running GNU/Linux
 TDEPFILES= sh-tdep.o monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o dsrec.o solib.o solib-svr4.o solib-legacy.o
-TM_FILE= tm-linux.h
+DEPRECATED_TM_FILE= tm-linux.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/nbsd.mt b/gdb/config/sh/nbsd.mt
index 62d0c5c..5c74d57 100644
--- a/gdb/config/sh/nbsd.mt
+++ b/gdb/config/sh/nbsd.mt
@@ -1,6 +1,6 @@
 # Target: SuperH running NetBSD
 TDEPFILES= sh-tdep.o shnbsd-tdep.o corelow.o nbsd-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/wince.mt b/gdb/config/sh/wince.mt
index 4ff5d6b..4187aef 100644
--- a/gdb/config/sh/wince.mt
+++ b/gdb/config/sh/wince.mt
@@ -1,5 +1,5 @@
 # Target: Renesas Super-H running on Windows CE
 TDEPFILES= sh-tdep.o wince.o
-TM_FILE= tm-wince.h
+DEPRECATED_TM_FILE= tm-wince.h
 MT_CFLAGS=-DSHx -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
 TM_CLIBS=-lrapi
diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt
index 43f1dad..180b0c7 100644
--- a/gdb/config/sparc/linux.mt
+++ b/gdb/config/sparc/linux.mt
@@ -1,4 +1,4 @@
 # Target: GNU/Linux SPARC
 TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
 	solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/sparc/linux64.mt b/gdb/config/sparc/linux64.mt
index 91da9f0..deb4008 100644
--- a/gdb/config/sparc/linux64.mt
+++ b/gdb/config/sparc/linux64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc64-linux-tdep.o \
 	sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
 	solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/sparc/nbsd.mt b/gdb/config/sparc/nbsd.mt
index 34097a7..7a5cf68 100644
--- a/gdb/config/sparc/nbsd.mt
+++ b/gdb/config/sparc/nbsd.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/sparc
 TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/config/sparc/nbsd64.mt b/gdb/config/sparc/nbsd64.mt
index 4a1b13b..6d8eb1b 100644
--- a/gdb/config/sparc/nbsd64.mt
+++ b/gdb/config/sparc/nbsd64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= sparc64-tdep.o sparc64nbsd-tdep.o \
 	sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
diff --git a/gdb/config/sparc/obsd.mt b/gdb/config/sparc/obsd.mt
index 800cb04..0dffffc 100644
--- a/gdb/config/sparc/obsd.mt
+++ b/gdb/config/sparc/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/sparc
 TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
diff --git a/gdb/config/sparc/obsd64.mt b/gdb/config/sparc/obsd64.mt
index 82587df..8f5ef80 100644
--- a/gdb/config/sparc/obsd64.mt
+++ b/gdb/config/sparc/obsd64.mt
@@ -2,4 +2,4 @@
 TDEPFILES= sparc64-tdep.o sparc64nbsd-tdep.o sparc64obsd-tdep.o \
 	sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= tm-nbsd.h
diff --git a/gdb/config/sparc/sol2-64.mt b/gdb/config/sparc/sol2-64.mt
index ec92e1f..809fc11 100644
--- a/gdb/config/sparc/sol2-64.mt
+++ b/gdb/config/sparc/sol2-64.mt
@@ -1,4 +1,4 @@
 # Target: Solaris UltraSPARC
 TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o sparc-sol2-tdep.o \
 	solib.o solib-svr4.o
-TM_FILE= tm-sol2.h
+DEPRECATED_TM_FILE= tm-sol2.h
diff --git a/gdb/config/sparc/sol2.mt b/gdb/config/sparc/sol2.mt
index 11fd4b8..a305d56 100644
--- a/gdb/config/sparc/sol2.mt
+++ b/gdb/config/sparc/sol2.mt
@@ -1,3 +1,3 @@
 # Target: Solaris SPARC
 TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o solib.o solib-svr4.o
-TM_FILE= tm-sol2.h
+DEPRECATED_TM_FILE= tm-sol2.h
diff --git a/gdb/config/sparc/vxworks.mt b/gdb/config/sparc/vxworks.mt
index ebb3e58..e84f6b7 100644
--- a/gdb/config/sparc/vxworks.mt
+++ b/gdb/config/sparc/vxworks.mt
@@ -1,4 +1,4 @@
 # Target: VxWorks SPARC
 TDEPFILES= sparc-tdep.o \
 	remote-vx.o remote-vxsparc.o xdr_ld.o xdr_ptrace.o xdr_rdb.o
-TM_FILE= config/tm-vxworks.h
+DEPRECATED_TM_FILE= config/tm-vxworks.h
diff --git a/gdb/config/vax/nbsd.mt b/gdb/config/vax/nbsd.mt
index 9cd754f..dfe746f 100644
--- a/gdb/config/vax/nbsd.mt
+++ b/gdb/config/vax/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: NetBSD/vax
 TDEPFILES= vax-tdep.o vaxnbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= solib.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gdb/configure b/gdb/configure
index 467b0c4..349fdfd 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10972,7 +10972,7 @@ s/XM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
 ' ${host_makefile_frag}`
 
 targetfile=`sed -n '
-s/TM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+s/DEPRECATED_TM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
 ' ${target_makefile_frag}`
 
 if test "${target}" = "${host}"; then
@@ -11021,9 +11021,9 @@ fi
 subdirs="doc testsuite $configdirs"
 
 
-# If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
-# (NAT_FILE) is not set in config/*/*.m[ht] files, we link to an empty
-# version.
+# If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or
+# nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
+# to an empty version.
 
 files=
 links=
@@ -11855,7 +11855,7 @@ if test "${nativefile}" = ""; then
 mv -f Makefile.tem Makefile
 fi
 
-sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
+sed -e '/^DEPRECATED_TM_FILE[ 	]*=/s,^DEPRECATED_TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,
 /^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
 mv -f Makefile.tmp Makefile
diff --git a/gdb/configure.in b/gdb/configure.in
index 02a0945..81be74b 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1467,7 +1467,7 @@ s/XM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
 ' ${host_makefile_frag}`
 
 targetfile=`sed -n '
-s/TM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+s/DEPRECATED_TM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
 ' ${target_makefile_frag}`
 
 if test "${target}" = "${host}"; then
@@ -1509,9 +1509,9 @@ fi
 
 AC_CONFIG_SUBDIRS($configdirs)
 
-# If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
-# (NAT_FILE) is not set in config/*/*.m[ht] files, we link to an empty
-# version.
+# If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or
+# nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
+# to an empty version.
 
 files=
 links=
@@ -1590,7 +1590,7 @@ mv -f Makefile.tem Makefile
 fi
 
 changequote(,)dnl
-sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
+sed -e '/^DEPRECATED_TM_FILE[ 	]*=/s,^DEPRECATED_TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,
 /^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
 mv -f Makefile.tmp Makefile
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 3168606..0095e5f 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-02  Andrew Cagney  <cagney@gnu.org>
+
+	* Makefile.in (TAGS): Replace TM_FILE with DEPRECATED_TM_FILE.
+
 2004-03-23  Daniel Jacobowitz  <drow@mvista.com>
 
 	* linux-low.c (linux_wait): Clear all_processes list also.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 3af7eb4..a5c1f95 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -183,7 +183,7 @@ gdbreplay: gdbreplay.o
 # specific routine gets the one for the correct machine.
 # The xyzzy stuff below deals with empty DEPFILES
 TAGS:	${TAGFILES}
-	etags `find ${srcdir}/../config -name $(TM_FILE) -print` \
+	etags `find ${srcdir}/../config -name $(DEPRECATED_TM_FILE) -print` \
 	  `find ${srcdir}/../config -name ${XM_FILE} -print` \
 	  `find ${srcdir}/../config -name ${NAT_FILE} -print` \
 	  `for i in yzzy ${DEPFILES}; do \
diff --git a/gdb/nlm/Makefile.in b/gdb/nlm/Makefile.in
index 6b3cf8c..a3fd151 100644
--- a/gdb/nlm/Makefile.in
+++ b/gdb/nlm/Makefile.in
@@ -130,7 +130,7 @@ gdbserve.O: prelude.o gdbserve.o $(TDEPFILES)
 # specific routine gets the one for the correct machine.
 # The xyzzy stuff below deals with empty DEPFILES
 TAGS:	${TAGFILES}
-	etags `find ${srcdir}/../config -name $(TM_FILE) -print` \
+	etags `find ${srcdir}/../config -name $(DEPRECATED_TM_FILE) -print` \
 	  `find ${srcdir}/../config -name ${XM_FILE} -print` \
 	  `find ${srcdir}/../config -name ${NAT_FILE} -print` \
 	  `for i in yzzy ${DEPFILES}; do \