* tm-*.h: Remove READ_DBX_FORMAT, COFF_FORMAT, and

READ_MIPS_FORMAT, which have been unused since BFD.  Still
remaining is COFF_NO_LONG_FILE_NAMES.
* tm-sun3.h, tm-altos.h:  Remove detritus accidentally left from
function calling code moved to m68k-tdep.c.

26 files changed, 41 insertions, 178 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 46621f7..0ffcf09 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov  7 04:51:19 1991  John Gilmore  (gnu at cygnus.com)
+
+	* tm-*.h:  Remove READ_DBX_FORMAT, COFF_FORMAT, and
+	READ_MIPS_FORMAT, which have been unused since BFD.  Still
+	remaining is COFF_NO_LONG_FILE_NAMES.
+	* tm-sun3.h, tm-altos.h:  Remove detritus accidentally left from
+	function calling code moved to m68k-tdep.c.
+
 Wed Nov  6 17:21:59 1991  John Gilmore  (gnu at cygnus.com)
 
 	* coffread.c:  Eliminate c_nsyms in favor of c_naux.
diff --git a/gdb/tm-3b1.h b/gdb/tm-3b1.h
index 5b49b07..4bcf01f 100644
--- a/gdb/tm-3b1.h
+++ b/gdb/tm-3b1.h
@@ -1,5 +1,5 @@
 /* Parameters for targeting to a 3b1.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -27,9 +27,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in COFF format.  */
+/* Debugger information will be in COFF format, without long filenames.  */
 
-#define COFF_FORMAT
 #define COFF_NO_LONG_FILE_NAMES
 
 /* Address of end of stack space.  */
diff --git a/gdb/tm-altos.h b/gdb/tm-altos.h
index bc0d2f9..7fb094a 100644
--- a/gdb/tm-altos.h
+++ b/gdb/tm-altos.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on an Altos 3068 (m68k running SVR2)
-   Copyright (C) 1987,1989 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -27,9 +27,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef NAMES_HAVE_UNDERSCORE
 
-/* Exec files and symbol tables are in COFF format */
+/* COFF files don't have long filenames.  */
 
-#define COFF_FORMAT
 #define COFF_NO_LONG_FILE_NAMES
 
 /* Address of end of stack space.  */
@@ -38,60 +37,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define STACK_END_ADDR (0x1000000)
 
 /* Amount PC must be decremented by after a breakpoint.
-   This is often the number of bytes in BREAKPOINT
-   but not always.
    On the Altos, the kernel resets the pc to the trap instr */
 
 #define DECR_PC_AFTER_BREAK 0
 
-
-/* Things needed for making the inferior call functions.  */
-
-/* Push an empty stack frame, to record the current PC, etc.  */
-
-#define PUSH_DUMMY_FRAME \
-{ register CORE_ADDR sp = read_register (SP_REGNUM);			\
-  register int regnum;							\
-  char raw_buffer[12];							\
-  sp = push_word (sp, read_register (PC_REGNUM));			\
-  sp = push_word (sp, read_register (FP_REGNUM));			\
-  write_register (FP_REGNUM, sp);					\
-  for (regnum = FP0_REGNUM + 7; regnum >= FP0_REGNUM; regnum--)		\
-    { read_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 12);	\
-      sp = push_bytes (sp, raw_buffer, 12); }				\
-  for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)			\
-    sp = push_word (sp, read_register (regnum));			\
-  sp = push_word (sp, read_register (PS_REGNUM));			\
-  write_register (SP_REGNUM, sp);  }
-
-/* Discard from the stack the innermost frame, 
-   restoring all saved registers.  */
-
-#define POP_FRAME  \
-{ register FRAME frame = get_current_frame ();				\
-  register CORE_ADDR fp;						\
-  register int regnum;							\
-  struct frame_saved_regs fsr;						\
-  struct frame_info *fi;						\
-  char raw_buffer[12];							\
-  fi = get_frame_info (frame);						\
-  fp = fi->frame;							\
-  get_frame_saved_regs (fi, &fsr);					\
-  for (regnum = FP0_REGNUM + 7; regnum >= FP0_REGNUM; regnum--)		\
-    if (fsr.regs[regnum])						\
-      { read_memory (fsr.regs[regnum], raw_buffer, 12);			\
-        write_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 12); }\
-  for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)			\
-    if (fsr.regs[regnum])						\
-      write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \
-  if (fsr.regs[PS_REGNUM])						\
-    write_register (PS_REGNUM, read_memory_integer (fsr.regs[PS_REGNUM], 4)); \
-  write_register (FP_REGNUM, read_memory_integer (fp, 4));		\
-  write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));  	\
-  write_register (SP_REGNUM, fp + 8);					\
-  flush_cached_frames ();						\
-  set_current_frame (create_new_frame (read_register (FP_REGNUM),	\
-					read_pc ())); }
-
-
 #include "tm-68k.h"
diff --git a/gdb/tm-altosgas.h b/gdb/tm-altosgas.h
index 14b56526..c20030c 100644
--- a/gdb/tm-altosgas.h
+++ b/gdb/tm-altosgas.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on an Altos 3068 using COFF encapsulation.
-   Copyright (C) 1989 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -21,8 +21,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "m-altos.h"
 
-#undef COFF_FORMAT
-#undef COFF_NO_LONG_FILE_NAMES
 #define NAMES_HAVE_UNDERSCORE
-
-#define READ_DBX_FORMAT
diff --git a/gdb/tm-arm.h b/gdb/tm-arm.h
index ad445df..ee63d6a 100644
--- a/gdb/tm-arm.h
+++ b/gdb/tm-arm.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB target for an ARM under RISCiX (4.3bsd).
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -32,10 +32,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-convex.h b/gdb/tm-convex.h
index be981b7..2424a2f 100644
--- a/gdb/tm-convex.h
+++ b/gdb/tm-convex.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on Convex Unix (4bsd)
-   Copyright (C) 1989 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -32,10 +32,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* There is come problem with the debugging symbols generated by the
    compiler such that the debugging symbol for the first line of a
    function overlap with the function prologue.  */
diff --git a/gdb/tm-hp300bsd.h b/gdb/tm-hp300bsd.h
index 9a6da61..4edcbd3 100644
--- a/gdb/tm-hp300bsd.h
+++ b/gdb/tm-hp300bsd.h
@@ -35,10 +35,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 #define TARGET_NBPG 4096
 #define TARGET_UPAGES 3
 
diff --git a/gdb/tm-hp300hpux.h b/gdb/tm-hp300hpux.h
index 742149b..f1926a1 100644
--- a/gdb/tm-hp300hpux.h
+++ b/gdb/tm-hp300hpux.h
@@ -1,5 +1,5 @@
 /* Parameters for execution on an HP 9000 model 320, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -29,10 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Address of end of stack space.  */
 
 #define STACK_END_ADDR 0xFFF00000
diff --git a/gdb/tm-i386v-g.h b/gdb/tm-i386v-g.h
index 0234404..669284a 100644
--- a/gdb/tm-i386v-g.h
+++ b/gdb/tm-i386v-g.h
@@ -1,5 +1,5 @@
 /* Macro definitions for i386 using the GNU object file format.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -30,6 +30,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "tm-i386v.h"
 
 #define NAMES_HAVE_UNDERSCORE
-
-#undef COFF_FORMAT
-#define READ_DBX_FORMAT
diff --git a/gdb/tm-i386v.h b/gdb/tm-i386v.h
index 2f92ac6..11c90a4 100644
--- a/gdb/tm-i386v.h
+++ b/gdb/tm-i386v.h
@@ -1,5 +1,5 @@
 /* Macro defintions for i386.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -31,18 +31,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define COFF_NO_LONG_FILE_NAMES
 
 /* turn this on when rest of gdb is ready */
-/* #define IEEE_FLOAT */
+#define IEEE_FLOAT
 
 /* Define this if the C compiler puts an underscore at the front
    of external names before giving them to the linker.  */
 
 /* #define NAMES_HAVE_UNDERSCORE */
 
-/* Specify debugger information format.  */
-
-/* #define READ_DBX_FORMAT */
-#define COFF_FORMAT
-
 /* 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.
diff --git a/gdb/tm-irix3.h b/gdb/tm-irix3.h
index d353fa5..8843302 100644
--- a/gdb/tm-irix3.h
+++ b/gdb/tm-irix3.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1990 Free Software Foundation, Inc.
+/* Target machine description for SGI Iris under Irix, for GDB.
+   Copyright 1990, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -26,14 +27,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*#define NAMES_HAVE_UNDERSCORE*/
 
-/* Debugger information will be in mips' format */
-
-#define READ_MIPS_FORMAT
-
-/* File format is coff, but with additions */
-
-#define COFF_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-isi.h b/gdb/tm-isi.h
index f214317..c235902 100644
--- a/gdb/tm-isi.h
+++ b/gdb/tm-isi.h
@@ -1,5 +1,5 @@
 /* Definitions to target GDB on an ISI Optimum V (3.05) under 4.3bsd.
-   Copyright (C) 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -27,10 +27,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Address of end of stack space.  */
 
 #define STACK_END_ADDR 0xfffe000
diff --git a/gdb/tm-merlin.h b/gdb/tm-merlin.h
index 2991c2e..3a4ac23 100644
--- a/gdb/tm-merlin.h
+++ b/gdb/tm-merlin.h
@@ -1,5 +1,5 @@
 /* Definitions to target GDB to a merlin under utek 2.1
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -28,10 +28,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-mips.h b/gdb/tm-mips.h
index f872a04..e47443f 100644
--- a/gdb/tm-mips.h
+++ b/gdb/tm-mips.h
@@ -1,7 +1,7 @@
 /* Definitions to make GDB run on a mips box under 4.3bsd.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
-   Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
-   and by Alessandro Forin(af@cs.cmu.edu) at CMU
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
+   Contributed by Per Bothner (bothner@cs.wisc.edu) at U.Wisconsin
+   and by Alessandro Forin (af@cs.cmu.edu) at CMU.
 
 This file is part of GDB.
 
diff --git a/gdb/tm-news.h b/gdb/tm-news.h
index bf70b74..6ec1fab 100644
--- a/gdb/tm-news.h
+++ b/gdb/tm-news.h
@@ -1,5 +1,5 @@
 /* Parameters for execution on a Sony/NEWS, for GDB, the GNU debugger.
-   Copyright (C) 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -34,9 +34,6 @@ Here is an m-news.h file for gdb.  It supports the 68881 registers.
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Symbols on this machine are in DBX format. */
-#define READ_DBX_FORMAT
-
 /* Use to compute STACK_END_ADDR.  */
 #define TARGET_UPAGES 2
 #define TARGET_NBPG 4096
diff --git a/gdb/tm-np1.h b/gdb/tm-np1.h
index 78aebb0..5fe8789 100644
--- a/gdb/tm-np1.h
+++ b/gdb/tm-np1.h
@@ -1,5 +1,5 @@
 /* Parameters for targeting on a Gould NP1, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -78,9 +78,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    of external names before giving them to the linker.  */
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-#define READ_DBX_FORMAT
-
 /* Address of blocks in N_LBRAC and N_RBRAC symbols are absolute addresses,
    not relative to start of source address.  */
 #define BLOCK_ADDRESS_ABSOLUTE
diff --git a/gdb/tm-pn.h b/gdb/tm-pn.h
index 36565df..e84cc27 100644
--- a/gdb/tm-pn.h
+++ b/gdb/tm-pn.h
@@ -1,5 +1,5 @@
 /* Parameters for targe of a Gould Powernode, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -79,9 +79,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    of external names before giving them to the linker.  */
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 #define FUNCTION_START_OFFSET	4
diff --git a/gdb/tm-pyr.h b/gdb/tm-pyr.h
index dbca0b4..750fef2 100644
--- a/gdb/tm-pyr.h
+++ b/gdb/tm-pyr.h
@@ -1,5 +1,5 @@
-/* Definitions to make GDB run on a Pyramidax under OSx 4.0 (4.2bsd).
-   Copyright (C) 1988, 1989 Free Software Foundation, Inc.
+/* Definitions to make GDB run on a Pyramid under OSx 4.0 (4.2bsd).
+   Copyright (C) 1988, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -48,10 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-sparc.h b/gdb/tm-sparc.h
index 0f96c38..dd82d9e 100644
--- a/gdb/tm-sparc.h
+++ b/gdb/tm-sparc.h
@@ -1,6 +1,7 @@
 /* Parameters for target machine of Sun 4, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
+
 This file is part of GDB.
 
 This program is free software; you can redistribute it and/or modify
@@ -27,10 +28,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* When passing a structure to a function, Sun cc passes the address
    in a register, not the structure itself.  It (under SunOS4) creates
    two symbols, so we get a LOC_ARG saying the address is on the stack
diff --git a/gdb/tm-sun2.h b/gdb/tm-sun2.h
index 21fd588..38ce53a 100644
--- a/gdb/tm-sun2.h
+++ b/gdb/tm-sun2.h
@@ -1,5 +1,5 @@
 /* Parameters for execution on a Sun, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 199 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -22,10 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Address of the end of stack space.  We get this from the system
    include files. */
 
diff --git a/gdb/tm-sun3.h b/gdb/tm-sun3.h
index 5b6aa91..d7e403f 100644
--- a/gdb/tm-sun3.h
+++ b/gdb/tm-sun3.h
@@ -19,8 +19,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_68881
 
-/* TARGET_SUN3 might be a more logical name, but that's used by
-   ../include/target.h (included by ../include/a.out.gnu.h).  */
+/* Let native-versus-cross support code know we are targeting sun3,
+   and modify registers to include sun3 fpustate register.  */
+
 #define GDB_TARGET_IS_SUN3 1
 
 /* Define this if the C compiler puts an underscore at the front
@@ -28,10 +29,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Address of the end of stack space.  We get this from the system
    include files. */
 
@@ -40,8 +37,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define STACK_END_ADDR USRSTACK
 
 #include "tm-68k.h"
-  SWAP_TARGET_AND_HOST (temp, 4);                       \
-  bcopy ((char *)&temp, (char *)(dummyname) + 20, 4);   \
-  temp = fun;                                           \
-  SWAP_TARGET_AND_HOST (temp, 4);                       \
-  bcopy ((char *)&temp, (char *)(dummyname) + 14, 4); }
diff --git a/gdb/tm-sun386.h b/gdb/tm-sun386.h
index a033cd5..3365374 100644
--- a/gdb/tm-sun386.h
+++ b/gdb/tm-sun386.h
@@ -1,5 +1,5 @@
 /* Parameters for execution on a Sun 386i, for GDB, the GNU debugger.
-   Copyright (C) 1986, 1987 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -38,10 +38,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* sun386 ptrace seems unable to change the frame pointer */
 #define PTRACE_FP_BUG
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-symmetry.h b/gdb/tm-symmetry.h
index 41d6db9..5089201 100644
--- a/gdb/tm-symmetry.h
+++ b/gdb/tm-symmetry.h
@@ -1,6 +1,6 @@
 /* Definitions to make GDB run on a Sequent Symmetry under dynix 3.0,
    with Weitek 1167 and i387 support.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -31,10 +31,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-tahoe.h b/gdb/tm-tahoe.h
index 7fadb41..72290fe 100644
--- a/gdb/tm-tahoe.h
+++ b/gdb/tm-tahoe.h
@@ -30,10 +30,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
diff --git a/gdb/tm-umax.h b/gdb/tm-umax.h
index 40e49ef..0dea301 100644
--- a/gdb/tm-umax.h
+++ b/gdb/tm-umax.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on an encore under umax 4.2
-   Copyright (C) 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -24,10 +24,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Exec files and symbol tables are in COFF format */
-
-#define COFF_FORMAT
-
 /* Need to get function ends by adding this to epilogue address from .bf
    record, not using x_fsize field.  */
 #define FUNCTION_EPILOGUE_SIZE 4
diff --git a/gdb/tm-vax.h b/gdb/tm-vax.h
index 8f5b29b..ac0bc86 100644
--- a/gdb/tm-vax.h
+++ b/gdb/tm-vax.h
@@ -1,5 +1,5 @@
 /* Definitions to make GDB run on a vax under 4.2bsd.
-   Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -45,10 +45,6 @@ fix to bug-gdb@prep.ai.mit.edu.  */
 
 #define NAMES_HAVE_UNDERSCORE
 
-/* Debugger information will be in DBX format.  */
-
-#define READ_DBX_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */