* config/m68k/tm-m68k.h: Renamed from config/m68k/tm-68k.h.

	* m68k/{tm-3b1.h, tm-altos.h, tm-amix.h, tm-es1800.h,
	tm-hp300bsd.h, tm-hp300hpux.h, tm-isi.h, tm-news.h, tm-os68k.h,
	tm-st2000.h, tm-sun2.h, tm-sun3.h, tm-vx68.h}:  Include tm-m68k.h
	instead of tm-68k.h.
	* Makefile.in (HFILES):  tm-68k.h renamed to tm-m68k.h.
	* README, a29k-pinsn.c, m68k-pinsn.c, m68k-stub.c, remote-vx.c,
	m68k/{altos.mh, altos.mt, apollo68b.mh, nm-apollo68b.h,
	nm-hp300bsd.h, config/m68k/xm-apollo68b.h}:  Map '68k' to 'm68k'.
	* a29k/tm-a29k.h, doc/gdbint.texinfo:  Account for renaming of
	tm-68k.h to tm-m68k.h.
	* m68k/m68k-fp.mt (TM_FILE):  tm-68k-fp.h renamed to tm-m68k-fp.h.
	* m68k/m68k-nofp.mt (TM_FILE):  tm-68k-nofp.h renamed to
	tm-m68k-nofp.h.

23 files changed, 25 insertions, 25 deletions

diff --git a/gdb/config/m68k/altos.mh b/gdb/config/m68k/altos.mh
index 13c37a7..0984539 100644
--- a/gdb/config/m68k/altos.mh
+++ b/gdb/config/m68k/altos.mh
@@ -1,4 +1,4 @@
-# Host: Altos 3068 (68k, System V release 2)
+# Host: Altos 3068 (m68k, System V release 2)
 XDEPFILES= infptrace.o inftarg.o fork-child.o altos-xdep.o
 XM_FILE= xm-altos.h
 REGEX=regex.o
diff --git a/gdb/config/m68k/altos.mt b/gdb/config/m68k/altos.mt
index d156615..9cf9b8f 100644
--- a/gdb/config/m68k/altos.mt
+++ b/gdb/config/m68k/altos.mt
@@ -1,3 +1,3 @@
-# Target: Altos 3068 (68k, System V release 2)
+# Target: Altos 3068 (m68k, System V release 2)
 TDEPFILES= m68k-pinsn.o exec.o
 TM_FILE= tm-altos.h
diff --git a/gdb/config/m68k/apollo68b.mh b/gdb/config/m68k/apollo68b.mh
index 58f7313..23860d6 100644
--- a/gdb/config/m68k/apollo68b.mh
+++ b/gdb/config/m68k/apollo68b.mh
@@ -1,4 +1,4 @@
-# Host: Apollo 68k, BSD mode.
+# Host: Apollo m68k, BSD mode.
 
 XM_FILE= xm-apollo68b.h
 XDEPFILES= ser-bsd.o
diff --git a/gdb/config/m68k/m68k-fp.mt b/gdb/config/m68k/m68k-fp.mt
index 139595b..177613d 100644
--- a/gdb/config/m68k/m68k-fp.mt
+++ b/gdb/config/m68k/m68k-fp.mt
@@ -1,3 +1,3 @@
 # Target: Motorola 68xxx with floating point
 TDEPFILES= exec.o m68k-pinsn.o m68k-tdep.o
-TM_FILE= tm-68k-fp.h
+TM_FILE= tm-m68k-fp.h
diff --git a/gdb/config/m68k/m68k-nofp.mt b/gdb/config/m68k/m68k-nofp.mt
index a2465bf..4d2f70a 100644
--- a/gdb/config/m68k/m68k-nofp.mt
+++ b/gdb/config/m68k/m68k-nofp.mt
@@ -1,3 +1,3 @@
 # Target: Motorola 68xxx without floating point
 TDEPFILES= exec.o m68k-pinsn.o m68k-tdep.o
-TM_FILE= tm-68k-nofp.h
+TM_FILE= tm-m68k-nofp.h
diff --git a/gdb/config/m68k/nm-apollo68b.h b/gdb/config/m68k/nm-apollo68b.h
index ba2998a..6f28b62 100644
--- a/gdb/config/m68k/nm-apollo68b.h
+++ b/gdb/config/m68k/nm-apollo68b.h
@@ -1,4 +1,4 @@
-/* Macro defintions for an Apollo 68k in BSD mode
+/* Macro defintions for an Apollo m68k in BSD mode
    Copyright (C) 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.
diff --git a/gdb/config/m68k/nm-hp300bsd.h b/gdb/config/m68k/nm-hp300bsd.h
index 3531842..6ad7f70 100644
--- a/gdb/config/m68k/nm-hp300bsd.h
+++ b/gdb/config/m68k/nm-hp300bsd.h
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* This is a hack.  This is only a hack.  Were this a common source file,
-   rather than a config file specific to BSD on HP 68k's, you would have
+   rather than a config file specific to BSD on HP m68k's, you would have
    been instructed to clean this up.  As it is, clean it up if FSF's 
    HP's-running-ancient-BSD ever go away.  */
 
diff --git a/gdb/config/m68k/tm-3b1.h b/gdb/config/m68k/tm-3b1.h
index b9bd4ef..4d726d3 100644
--- a/gdb/config/m68k/tm-3b1.h
+++ b/gdb/config/m68k/tm-3b1.h
@@ -26,4 +26,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define STACK_END_ADDR 0x300000
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-altos.h b/gdb/config/m68k/tm-altos.h
index b1b0733..05ba2f3 100644
--- a/gdb/config/m68k/tm-altos.h
+++ b/gdb/config/m68k/tm-altos.h
@@ -33,7 +33,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define DECR_PC_AFTER_BREAK 0
 
 /* The only reason this is here is the tm-altos.h reference below.  It
-   was moved back here from tm-68k.h.  FIXME? */
+   was moved back here from tm-m68k.h.  FIXME? */
 
 #define SKIP_PROLOGUE(pc)   \
 { register int op = read_memory_integer (pc, 2);	\
@@ -51,4 +51,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
     pc += 2;   /* skip bra #char */			\
 }
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-amix.h b/gdb/config/m68k/tm-amix.h
index b758da7..f5438be 100644
--- a/gdb/config/m68k/tm-amix.h
+++ b/gdb/config/m68k/tm-amix.h
@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define FRAME_CHAIN_VALID_ALTERNATE
 
 #include "tm-sysv4.h"
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* Offsets (in target ints) into jmp_buf.  Not defined in any system header
    file, so we have to step through setjmp/longjmp with a debugger and figure
diff --git a/gdb/config/m68k/tm-es1800.h b/gdb/config/m68k/tm-es1800.h
index f62f043..bd1dbe3 100644
--- a/gdb/config/m68k/tm-es1800.h
+++ b/gdb/config/m68k/tm-es1800.h
@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_68881
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* Longjmp stuff borrowed from sun3 configuration.  Don't know if correct. 
    FIXME.  */
diff --git a/gdb/config/m68k/tm-hp300bsd.h b/gdb/config/m68k/tm-hp300bsd.h
index 4dc95e1..6a19069 100644
--- a/gdb/config/m68k/tm-hp300bsd.h
+++ b/gdb/config/m68k/tm-hp300bsd.h
@@ -47,4 +47,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define STACK_END_ADDR 0xfff00000
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-hp300hpux.h b/gdb/config/m68k/tm-hp300hpux.h
index df2df4a..263d1eb 100644
--- a/gdb/config/m68k/tm-hp300hpux.h
+++ b/gdb/config/m68k/tm-hp300hpux.h
@@ -28,4 +28,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define STACK_END_ADDR 0xFFF00000
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-isi.h b/gdb/config/m68k/tm-isi.h
index da28c2f..eec7f30 100644
--- a/gdb/config/m68k/tm-isi.h
+++ b/gdb/config/m68k/tm-isi.h
@@ -135,7 +135,7 @@ retry:									\
 }
 
 /* The only reason this is here is the tm-isi.h reference below.  It
-   was moved back here from tm-68k.h.  FIXME? */
+   was moved back here from tm-m68k.h.  FIXME? */
 
 #define SKIP_PROLOGUE(pc)   \
 { register int op = read_memory_integer (pc, 2);	\
@@ -153,4 +153,4 @@ retry:									\
     pc += 2;   /* skip bra #char */			\
 }
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-68k-fp.h b/gdb/config/m68k/tm-m68k-fp.h
index 73e228c..4dcebaa 100644
--- a/gdb/config/m68k/tm-68k-fp.h
+++ b/gdb/config/m68k/tm-m68k-fp.h
@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_68881
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* Longjmp info comes from the Sun-3 machine description.  Might as well
    guess... */
diff --git a/gdb/config/m68k/tm-68k-nofp.h b/gdb/config/m68k/tm-m68k-nofp.h
index 0ce320c..d7e103b 100644
--- a/gdb/config/m68k/tm-68k-nofp.h
+++ b/gdb/config/m68k/tm-m68k-nofp.h
@@ -17,7 +17,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* Longjmp info comes from the Sun-3 machine description.  Might as well
    guess... */
diff --git a/gdb/config/m68k/tm-68k.h b/gdb/config/m68k/tm-m68k.h
index 96d71de..96d71de 100644
--- a/gdb/config/m68k/tm-68k.h
+++ b/gdb/config/m68k/tm-m68k.h
diff --git a/gdb/config/m68k/tm-news.h b/gdb/config/m68k/tm-news.h
index 7f784f8..4bcaf4f 100644
--- a/gdb/config/m68k/tm-news.h
+++ b/gdb/config/m68k/tm-news.h
@@ -82,4 +82,4 @@ Here is an m-news.h file for gdb.  It supports the 68881 registers.
     val = read_memory_integer (pc + 2, 4);			\
   val >>= 2; }
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-st2000.h b/gdb/config/m68k/tm-st2000.h
index 64467be..6a23830 100644
--- a/gdb/config/m68k/tm-st2000.h
+++ b/gdb/config/m68k/tm-st2000.h
@@ -19,4 +19,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_68881		/* GDB won't compile without this */
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-sun2.h b/gdb/config/m68k/tm-sun2.h
index 1d2f85d..864de59 100644
--- a/gdb/config/m68k/tm-sun2.h
+++ b/gdb/config/m68k/tm-sun2.h
@@ -24,4 +24,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <machine/vmparam.h>
 #define STACK_END_ADDR USRSTACK
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-sun3.h b/gdb/config/m68k/tm-sun3.h
index 1a698f3..cae185b 100644
--- a/gdb/config/m68k/tm-sun3.h
+++ b/gdb/config/m68k/tm-sun3.h
@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define GDB_TARGET_IS_SUN3 1
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* Offsets (in target ints) into jmp_buf.  Not defined by Sun, but at least
    documented in a comment in <machine/setjmp.h>! */
diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h
index 8ce67a1..07b8027 100644
--- a/gdb/config/m68k/tm-vx68.h
+++ b/gdb/config/m68k/tm-vx68.h
@@ -1,4 +1,4 @@
-/* Target machine description for VxWorks 68k's, for GDB, the GNU debugger.
+/* Target machine description for VxWorks m68k's, for GDB, the GNU debugger.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
@@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* We have more complex, useful breakpoints on the target.  */
 #define	DECR_PC_AFTER_BREAK	0
 
-#include "m68k/tm-68k.h"
+#include "m68k/tm-m68k.h"
 
 /* We are guaranteed to have a zero frame pointer at bottom of stack, too. */
 #undef	FRAME_CHAIN
diff --git a/gdb/config/m68k/xm-apollo68b.h b/gdb/config/m68k/xm-apollo68b.h
index 9d1d39c..829e83c 100644
--- a/gdb/config/m68k/xm-apollo68b.h
+++ b/gdb/config/m68k/xm-apollo68b.h
@@ -1,4 +1,4 @@
-/* Macro defintions for an Apollo 68k in BSD mode
+/* Macro definitions for an Apollo m68k in BSD mode
    Copyright (C) 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.