* 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.

29 files changed, 52 insertions, 39 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5df0f39..f73f9f1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,9 +1,20 @@
-Mon Mar 29 13:55:29 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* breakpoint.c: Add comments regarding breakpoint_re_set.
-
 Mon Mar 29 15:03:25 1993  Fred Fish  (fnf@cygnus.com)
 
+	* 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.
+
 	* config/a29k/tm-a29k.h:  Renamed from config/a29k/tm-29k.h.
 	* a29k-pinsn.c:  Renamed from am29k-pinsn.c.
 	* a29k-tdep.c:  Renamed from am29k-tdep.c.
@@ -22,6 +33,8 @@ Mon Mar 29 15:03:25 1993  Fred Fish  (fnf@cygnus.com)
 
 Mon Mar 29 13:55:29 1993  Jim Kingdon  (kingdon@cygnus.com)
 
+	* breakpoint.c: Add comments regarding breakpoint_re_set.
+
 	* xcoffread.c (sort_syms, compare_symbols): Remove.
 	(xcoff_symfile_read): Use sort_all_symtab_syms from symfile.c
 	not our own sort_syms (it is identical).
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index df7f3ef..0ee7296 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -307,7 +307,7 @@ HFILES = breakpoint.h buildsym.h call-cmds.h command.h defs.h environ.h \
 	partial-stab.h serial.h signals.h solib.h symfile.h symtab.h \
 	stabsread.h target.h terminal.h typeprint.h xcoffsolib.h value.h \
 	c-lang.h ch-lang.h m2-lang.h complaints.h ns32k-opcode.h valprint.h \
-	config/m68k/tm-68k.h config/pa/tm-hppa.h \
+	config/m68k/tm-m68k.h config/pa/tm-hppa.h \
 	config/i960/tm-i960.h config/sparc/tm-sparc.h config/tm-sunos.h \
 	config/tm-sysv4.h config/m68k/xm-m68k.h config/sparc/xm-sparc.h \
 	config/xm-sysv4.h config/vax/xm-vax.h config/nm-trash.h \
@@ -564,8 +564,8 @@ config-check-targets:
 # for some machines.
 # But these rules don't do what we want; we want to hack the foo.o: tm.h
 # dependency to do the right thing.
-tm-isi.h tm-sun3.h tm-news.h tm-hp300bsd.h tm-altos.h: tm-68k.h
-tm-hp300hpux.h tm-sun2.h tm-3b1.h: tm-68k.h
+tm-isi.h tm-sun3.h tm-news.h tm-hp300bsd.h tm-altos.h: tm-m68k.h
+tm-hp300hpux.h tm-sun2.h tm-3b1.h: tm-m68k.h
 xm-news1000.h: xm-news.h
 xm-i386-sv32.h: xm-i386.h
 tm-i386gas.h: tm-i386.h
diff --git a/gdb/a29k-pinsn.c b/gdb/a29k-pinsn.c
index bd95aef..db9cb24 100644
--- a/gdb/a29k-pinsn.c
+++ b/gdb/a29k-pinsn.c
@@ -185,8 +185,8 @@ print_insn (memaddr, stream)
 
 		case 'P':
 		  /* This output looks just like absolute addressing, but
-		     maybe that's OK (it's what the GDB 68k and EBMON
-		     29k disassemblers do).  */
+		     maybe that's OK (it's what the GDB m68k and EBMON
+		     a29k disassemblers do).  */
 		  /* All the shifting is to sign-extend it.  p*/
 		  print_address
 		    (memaddr +
diff --git a/gdb/config/a29k/tm-a29k.h b/gdb/config/a29k/tm-a29k.h
index 56d6a86..1d10bfe 100644
--- a/gdb/config/a29k/tm-a29k.h
+++ b/gdb/config/a29k/tm-a29k.h
@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
    If gdb is ported to other a29k machines/systems, the
    machine/system-specific parts should be removed from this file (a
-   la tm-68k.h).  */
+   la tm-m68k.h).  */
 
 /* Byte order is configurable, but this machine runs big-endian.  */
 #define TARGET_BYTE_ORDER BIG_ENDIAN
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.
diff --git a/gdb/m68k-pinsn.c b/gdb/m68k-pinsn.c
index 13d5bfe..01bbd92 100644
--- a/gdb/m68k-pinsn.c
+++ b/gdb/m68k-pinsn.c
@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "defs.h"
 #include "dis-asm.h"
 
-/* 68k instructions are never longer than this many bytes.  */
+/* m68k instructions are never longer than this many bytes.  */
 #define MAXLEN 22
 
 /* Print the m68k instruction at address MEMADDR in debugged memory,
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 91d2e87..9fc3e41 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -386,7 +386,7 @@ vx_read_register (regno)
   ptrace_in.pid = inferior_pid;
   ptrace_out.info.more_data = (caddr_t) &out_data;
 #ifndef I80960
-  out_data.len   = 18 * REGISTER_RAW_SIZE (0);		/* FIXME 68k hack */
+  out_data.len   = 18 * REGISTER_RAW_SIZE (0);		/* FIXME m68k hack */
 #else
   out_data.len = (16 + 16 + 3) * REGISTER_RAW_SIZE (0);
 #endif
@@ -506,7 +506,7 @@ vx_write_register (regno)
 
   in_data.len = (16 + 16 + 3) * sizeof (REGISTER_TYPE);
 
-#else  /* not 960 -- assume 68k -- FIXME */
+#else  /* not 960 -- assume m68k -- FIXME */
 
   in_data.len = 18 * sizeof (REGISTER_TYPE);
 
@@ -536,7 +536,7 @@ vx_write_register (regno)
       in_data.bytes = &registers[REGISTER_BYTE (FP0_REGNUM)];
       in_data.len = 4 * REGISTER_RAW_SIZE (FP0_REGNUM);
 #endif
-#else  /* not 960 -- assume 68k -- FIXME */
+#else  /* not 960 -- assume m68k -- FIXME */
 
       in_data.bytes = &registers[REGISTER_BYTE (FP0_REGNUM)];
       in_data.len = (8 * REGISTER_RAW_SIZE (FP0_REGNUM)