Obsolete ns32k-*-mach3*, ns32k-umax-*, ns32k-utek-sysv* and

ns32k-utek-*.

12 files changed, 573 insertions, 573 deletions

diff --git a/gdb/config/ns32k/merlin.mh b/gdb/config/ns32k/merlin.mh
index f9c3e7b..9da8f1e 100644
--- a/gdb/config/ns32k/merlin.mh
+++ b/gdb/config/ns32k/merlin.mh
@@ -1,16 +1,16 @@
-# Host: Merlin running utek 2.1
-XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
-XM_FILE= xm-merlin.h
-
-# FIXME: M_INSTALL is gone from the gdb makefile.  If anyone cares
-# about the Merlin anymore, and the bug which inspired
-# SHELL_FILE/gdb-sh is still there, will need to reinstate it.  Also,
-# this should be done for native only.
-
-# See SHELL_FILE in xm-merlin.h for a explanation of this.
-
-# FIXME: This should use $prefix, but only if SHELL_FILE does too.
-
-M_INSTALL=cp /bin/sh /usr/local/lib/gdb-sh; \
-chmod ogu+rw /usr/local/lib/gdb-sh
-M_UNINSTALL = rm -f /usr/local/lib/gdb-sh
+# OBSOLETE # Host: Merlin running utek 2.1
+# OBSOLETE XDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+# OBSOLETE XM_FILE= xm-merlin.h
+# OBSOLETE 
+# OBSOLETE # FIXME: M_INSTALL is gone from the gdb makefile.  If anyone cares
+# OBSOLETE # about the Merlin anymore, and the bug which inspired
+# OBSOLETE # SHELL_FILE/gdb-sh is still there, will need to reinstate it.  Also,
+# OBSOLETE # this should be done for native only.
+# OBSOLETE 
+# OBSOLETE # See SHELL_FILE in xm-merlin.h for a explanation of this.
+# OBSOLETE 
+# OBSOLETE # FIXME: This should use $prefix, but only if SHELL_FILE does too.
+# OBSOLETE 
+# OBSOLETE M_INSTALL=cp /bin/sh /usr/local/lib/gdb-sh; \
+# OBSOLETE chmod ogu+rw /usr/local/lib/gdb-sh
+# OBSOLETE M_UNINSTALL = rm -f /usr/local/lib/gdb-sh
diff --git a/gdb/config/ns32k/merlin.mt b/gdb/config/ns32k/merlin.mt
index b346077..a105c14 100644
--- a/gdb/config/ns32k/merlin.mt
+++ b/gdb/config/ns32k/merlin.mt
@@ -1,3 +1,3 @@
-# Target: Merlin running utek 2.1
-TDEPFILES= ns32k-tdep.o
-TM_FILE= tm-merlin.h
+# OBSOLETE # Target: Merlin running utek 2.1
+# OBSOLETE TDEPFILES= ns32k-tdep.o
+# OBSOLETE TM_FILE= tm-merlin.h
diff --git a/gdb/config/ns32k/nm-umax.h b/gdb/config/ns32k/nm-umax.h
index f86706d..7124420 100644
--- a/gdb/config/ns32k/nm-umax.h
+++ b/gdb/config/ns32k/nm-umax.h
@@ -1,55 +1,55 @@
-/* Definitions to make GDB run on an encore under umax 4.2
-   Copyright 1987, 1989, 1992, 2001 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.  */
-
-/* Do implement the attach and detach commands...  */
-#define ATTACH_DETACH
-
-/* Offset of registers within u area.  */
-#define U_REGS_OFFSET 0
-
-/* called from register_addr() -- blockend not used for now */
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-{ 									\
-  switch (regno) {							\
-  case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\
-	addr = PU_R0 - (regno * sizeof (int)); break;			\
-  case SP_REGNUM:							\
-  	addr = PU_SP; break;						\
-  case PC_REGNUM:							\
-  	addr = PU_PC; break;						\
-  case FP_REGNUM:							\
-  	addr = PU_FP; break;						\
-  case PS_REGNUM:							\
-  	addr = PU_PSL; break;						\
-  case FPS_REGNUM:							\
-  	addr = PU_FSR; break;						\
-  case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\
-  case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\
-  case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\
-  case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\
-  	addr = PU_F0 + (regno - FP0_REGNUM) * sizeof (float); break;	\
-  case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\
-  case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\
-  	addr = PU_F0 + (regno - LP0_REGNUM) * sizeof (double); break;	\
-  default:								\
-  	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
-  }									\
-}
+/* OBSOLETE /* Definitions to make GDB run on an encore under umax 4.2 */
+/* OBSOLETE    Copyright 1987, 1989, 1992, 2001 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Do implement the attach and detach commands...  */ */
+/* OBSOLETE #define ATTACH_DETACH */
+/* OBSOLETE  */
+/* OBSOLETE /* Offset of registers within u area.  */ */
+/* OBSOLETE #define U_REGS_OFFSET 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* called from register_addr() -- blockend not used for now */ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) \ */
+/* OBSOLETE { 									\ */
+/* OBSOLETE   switch (regno) {							\ */
+/* OBSOLETE   case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\ */
+/* OBSOLETE 	addr = PU_R0 - (regno * sizeof (int)); break;			\ */
+/* OBSOLETE   case SP_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_SP; break;						\ */
+/* OBSOLETE   case PC_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_PC; break;						\ */
+/* OBSOLETE   case FP_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_FP; break;						\ */
+/* OBSOLETE   case PS_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_PSL; break;						\ */
+/* OBSOLETE   case FPS_REGNUM:							\ */
+/* OBSOLETE   	addr = PU_FSR; break;						\ */
+/* OBSOLETE   case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\ */
+/* OBSOLETE   case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\ */
+/* OBSOLETE   	addr = PU_F0 + (regno - FP0_REGNUM) * sizeof (float); break;	\ */
+/* OBSOLETE   case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\ */
+/* OBSOLETE   case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\ */
+/* OBSOLETE   	addr = PU_F0 + (regno - LP0_REGNUM) * sizeof (double); break;	\ */
+/* OBSOLETE   default:								\ */
+/* OBSOLETE   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\ */
+/* OBSOLETE 	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\ */
+/* OBSOLETE   }									\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
index 7f0992a..7514751 100644
--- a/gdb/config/ns32k/ns32km3.mh
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -1,7 +1,7 @@
-# Host: ns32k running Mach3
-
-XDEPFILES=
-NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o
-NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach
-XM_FILE= xm-ns32km3.h
-NAT_FILE= nm-m3.h
+# OBSOLETE # Host: ns32k running Mach3
+# OBSOLETE 
+# OBSOLETE XDEPFILES=
+# OBSOLETE NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o
+# OBSOLETE NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach
+# OBSOLETE XM_FILE= xm-ns32km3.h
+# OBSOLETE NAT_FILE= nm-m3.h
diff --git a/gdb/config/ns32k/ns32km3.mt b/gdb/config/ns32k/ns32km3.mt
index 9391176..f9d0fa0 100644
--- a/gdb/config/ns32k/ns32km3.mt
+++ b/gdb/config/ns32k/ns32km3.mt
@@ -1,3 +1,3 @@
-# Target: ns32k with a.out on Mach 3
-TDEPFILES= ns32k-tdep.o 
-TM_FILE= tm-ns32km3.h
+# OBSOLETE # Target: ns32k with a.out on Mach 3
+# OBSOLETE TDEPFILES= ns32k-tdep.o 
+# OBSOLETE TM_FILE= tm-ns32km3.h
diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
index 56c1f5e..8c88f46 100644
--- a/gdb/config/ns32k/tm-merlin.h
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -1,289 +1,289 @@
-/* Definitions to target GDB to a merlin under utek 2.1
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000
-   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.  */
-
-#include "regcache.h"
-
-#define TARGET_BYTE_ORDER LITTLE_ENDIAN
-
-/* Offset from address of function to start of its code.
-   Zero on most machines.  */
-
-#define FUNCTION_START_OFFSET 0
-
-/* Advance PC across any function entry prologue instructions
-   to reach some "real" code.  */
-
-extern CORE_ADDR merlin_skip_prologue (CORE_ADDR);
-#define SKIP_PROLOGUE(pc) (merlin_skip_prologue (pc))
-
-/* Immediately after a function call, return the saved pc.
-   Can't always go through the frames for this because on some machines
-   the new frame is not set up until the new function executes
-   some instructions.  */
-
-#define SAVED_PC_AFTER_CALL(frame) \
-	read_memory_integer (read_register (SP_REGNUM), 4)
-
-/* Address of end of stack space.  */
-
-#define STACK_END_ADDR (0x800000)
-
-/* Stack grows downward.  */
-
-#define INNER_THAN(lhs,rhs) ((lhs) < (rhs))
-
-/* Sequence of bytes for breakpoint instruction.  */
-
-#define BREAKPOINT {0xf2}
-
-/* Amount PC must be decremented by after a breakpoint.
-   This is often the number of bytes in BREAKPOINT
-   but not always.  */
-
-#define DECR_PC_AFTER_BREAK 0
-
-/* Define this to say that the "svc" insn is followed by
-   codes in memory saying which kind of system call it is.  */
-
-#define NS32K_SVC_IMMED_OPERANDS
-
-/* Say how long (ordinary) registers are.  This is a piece of bogosity
-   used in push_word and a few other places; REGISTER_RAW_SIZE is the
-   real way to know how big a register is.  */
-
-#define REGISTER_SIZE 4
-
-/* Number of machine registers */
-
-#define NUM_REGS		25
-
-#define NUM_GENERAL_REGS	8
-
-/* Initializer for an array of names of registers.
-   There should be NUM_REGS strings in this initializer.  */
-
-#define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\
-			"pc", "sp", "fp", "ps",				\
- 			"fsr",						\
- 			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\
-			"l0", "l1", "l2", "l3", "l4",			\
- 			}
-
-/* Register numbers of various important registers.
-   Note that some of these values are "real" register numbers,
-   and correspond to the general registers of the machine,
-   and some are "phony" register numbers which are too large
-   to be actual register numbers as far as the user is concerned
-   but do serve to get the desired values when passed to read_register.  */
-
-#define AP_REGNUM FP_REGNUM
-#define FP_REGNUM 10		/* Contains address of executing stack frame */
-#define SP_REGNUM 9		/* Contains address of top of stack */
-#define PC_REGNUM 8		/* Contains program counter */
-#define PS_REGNUM 11		/* Contains processor status */
-#define FPS_REGNUM 12		/* Floating point status register */
-#define FP0_REGNUM 13		/* Floating point register 0 */
-#define LP0_REGNUM 21		/* Double register 0 (same as FP0) */
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#define REGISTER_BYTES ((NUM_REGS - 4) * sizeof (int) + 4 * sizeof (double))
-
-/* Index within `registers' of the first byte of the space for
-   register N.  */
-
-#define REGISTER_BYTE(N) ((N) >= LP0_REGNUM ? \
-	LP0_REGNUM * 4 + ((N) - LP0_REGNUM) * 8 : (N) * 4)
-
-/* Number of bytes of storage in the actual machine representation
-   for register N.  On the 32000, all regs are 4 bytes
-   except for the doubled floating registers. */
-
-#define REGISTER_RAW_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4)
-
-/* Number of bytes of storage in the program's representation
-   for register N.  On the 32000, all regs are 4 bytes
-   except for the doubled floating registers. */
-
-#define REGISTER_VIRTUAL_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4)
-
-/* Largest value REGISTER_RAW_SIZE can have.  */
-
-#define MAX_REGISTER_RAW_SIZE 8
-
-/* Largest value REGISTER_VIRTUAL_SIZE can have.  */
-
-#define MAX_REGISTER_VIRTUAL_SIZE 8
-
-/* Return the GDB type object for the "standard" data type
-   of data in register N.  */
-
-#define REGISTER_VIRTUAL_TYPE(N) \
-  ((N) >= FP0_REGNUM ?		\
-    ((N) >= LP0_REGNUM ?	\
-     builtin_type_double	\
-     : builtin_type_float)	\
-   : builtin_type_int)
-
-/* Store the address of the place in which to copy the structure the
-   subroutine will return.  This is called from call_function.
-
-   On this machine this is a no-op, as gcc doesn't run on it yet.
-   This calling convention is not used. */
-
-#define STORE_STRUCT_RETURN(ADDR, SP)
-
-/* Extract from an array REGBUF containing the (raw) register state
-   a function return value of type TYPE, and copy that, in virtual format,
-   into VALBUF.  */
-
-#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
-  memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE))
-
-/* Write into appropriate registers a function return value
-   of type TYPE, given in virtual format.  */
-
-#define STORE_RETURN_VALUE(TYPE,VALBUF) \
-  write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE))
-
-/* Extract from an array REGBUF containing the (raw) register state
-   the address in which a function should return its structure value,
-   as a CORE_ADDR (or an expression that can be used as one).  */
-
-#define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(int *)(REGBUF))
-
-/* Describe the pointer in each stack frame to the previous stack frame
-   (its caller).  */
-
-/* FRAME_CHAIN takes a frame's nominal address
-   and produces the frame's chain-pointer. */
-
-/* In the case of the Merlin, the frame's nominal address is the FP value,
-   and at that address is saved previous FP value as a 4-byte word.  */
-
-#define FRAME_CHAIN(thisframe)  \
-  (!inside_entry_file ((thisframe)->pc) ? \
-   read_memory_integer ((thisframe)->frame, 4) :\
-   0)
-
-/* Define other aspects of the stack frame.  */
-
-#define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4))
-
-/* compute base of arguments */
-#define FRAME_ARGS_ADDRESS(fi) ((fi)->frame)
-
-#define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame)
-
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell.  */
-
-extern int merlin_frame_num_args (struct frame_info *fi);
-#define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi)))
-
-/* Return number of bytes at start of arglist that are not really args.  */
-
-#define FRAME_ARGS_SKIP 8
-
-/* Put here the code to store, into a struct frame_saved_regs,
-   the addresses of the saved registers of frame described by FRAME_INFO.
-   This includes special registers such as pc and fp saved in special
-   ways in the stack frame.  sp is even more special:
-   the address we return for it IS the sp for the next frame.  */
-
-#define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
-{ int regmask,regnum;						\
-  int localcount;						\
-  CORE_ADDR enter_addr;						\
-  CORE_ADDR next_addr;						\
-								\
-  enter_addr = get_pc_function_start ((frame_info)->pc);	\
-  regmask = read_memory_integer (enter_addr+1, 1);		\
-  localcount = ns32k_localcount (enter_addr);			\
-  next_addr = (frame_info)->frame + localcount;			\
-  for (regnum = 0; regnum < 8; regnum++, regmask >>= 1)		\
-    (frame_saved_regs).regs[regnum]				\
-      = (regmask & 1) ? (next_addr -= 4) : 0;			\
-  (frame_saved_regs).regs[SP_REGNUM] = (frame_info)->frame + 4;	\
-  (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4;	\
-  (frame_saved_regs).regs[FP_REGNUM]				\
-     = read_memory_integer ((frame_info)->frame, 4); }
-
-
-/* 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;					\
-  sp = push_word (sp, read_register (PC_REGNUM));	\
-  sp = push_word (sp, read_register (FP_REGNUM));	\
-  write_register (FP_REGNUM, sp);			\
-  for (regnum = 0; regnum < 8; regnum++)  		\
-    sp = push_word (sp, read_register (regnum));	\
-  write_register (SP_REGNUM, sp);  			\
-}
-
-/* Discard from the stack the innermost frame, restoring all registers.  */
-
-#define POP_FRAME  \
-{ register struct frame_info *frame = get_current_frame ();	 \
-  register CORE_ADDR fp;					 \
-  register int regnum;						 \
-  struct frame_saved_regs fsr;					 \
-  struct frame_info *fi;						 \
-  fp = frame->frame;						 \
-  get_frame_saved_regs (frame, &fsr);				 \
-  for (regnum = 0; regnum < 8; regnum++)			 \
-    if (fsr.regs[regnum])					 \
-      write_register (regnum, read_memory_integer (fsr.regs[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 ();					 \
-}
-
-/* This sequence of words is the instructions
-   enter        0xff,0          82 ff 00
-   jsr  @0x00010203     7f ae c0 01 02 03
-   adjspd       0x69696969      7f a5 01 02 03 04
-   bpt                  f2
-   Note this is 16 bytes.  */
-
-#define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 }
-
-#define CALL_DUMMY_START_OFFSET	3
-#define CALL_DUMMY_LENGTH	16
-#define CALL_DUMMY_ADDR		5
-#define CALL_DUMMY_NARGS	11
-
-/* Insert the specified number of args and function address
-   into a call sequence of the above form stored at DUMMYNAME.  */
-
-#define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   		\
-{ int flipped = fun | 0xc0000000;				\
-  flip_bytes (&flipped, 4);					\
-  *((int *) (((char *) dummyname)+CALL_DUMMY_ADDR)) = flipped;	\
-  flipped = - nargs * 4;					\
-  flip_bytes (&flipped, 4);					\
-  *((int *) (((char *) dummyname)+CALL_DUMMY_NARGS)) = flipped;	\
-}
+/* OBSOLETE /* Definitions to target GDB to a merlin under utek 2.1 */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #include "regcache.h" */
+/* OBSOLETE  */
+/* OBSOLETE #define TARGET_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* Offset from address of function to start of its code. */
+/* OBSOLETE    Zero on most machines.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FUNCTION_START_OFFSET 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* Advance PC across any function entry prologue instructions */
+/* OBSOLETE    to reach some "real" code.  */ */
+/* OBSOLETE  */
+/* OBSOLETE extern CORE_ADDR merlin_skip_prologue (CORE_ADDR); */
+/* OBSOLETE #define SKIP_PROLOGUE(pc) (merlin_skip_prologue (pc)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Immediately after a function call, return the saved pc. */
+/* OBSOLETE    Can't always go through the frames for this because on some machines */
+/* OBSOLETE    the new frame is not set up until the new function executes */
+/* OBSOLETE    some instructions.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define SAVED_PC_AFTER_CALL(frame) \ */
+/* OBSOLETE 	read_memory_integer (read_register (SP_REGNUM), 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Address of end of stack space.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STACK_END_ADDR (0x800000) */
+/* OBSOLETE  */
+/* OBSOLETE /* Stack grows downward.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define INNER_THAN(lhs,rhs) ((lhs) < (rhs)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Sequence of bytes for breakpoint instruction.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define BREAKPOINT {0xf2} */
+/* OBSOLETE  */
+/* OBSOLETE /* Amount PC must be decremented by after a breakpoint. */
+/* OBSOLETE    This is often the number of bytes in BREAKPOINT */
+/* OBSOLETE    but not always.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define DECR_PC_AFTER_BREAK 0 */
+/* OBSOLETE  */
+/* OBSOLETE /* Define this to say that the "svc" insn is followed by */
+/* OBSOLETE    codes in memory saying which kind of system call it is.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define NS32K_SVC_IMMED_OPERANDS */
+/* OBSOLETE  */
+/* OBSOLETE /* Say how long (ordinary) registers are.  This is a piece of bogosity */
+/* OBSOLETE    used in push_word and a few other places; REGISTER_RAW_SIZE is the */
+/* OBSOLETE    real way to know how big a register is.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_SIZE 4 */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of machine registers */ */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_REGS		25 */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_GENERAL_REGS	8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Initializer for an array of names of registers. */
+/* OBSOLETE    There should be NUM_REGS strings in this initializer.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\ */
+/* OBSOLETE 			"pc", "sp", "fp", "ps",				\ */
+/* OBSOLETE  			"fsr",						\ */
+/* OBSOLETE  			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\ */
+/* OBSOLETE 			"l0", "l1", "l2", "l3", "l4",			\ */
+/* OBSOLETE  			} */
+/* OBSOLETE  */
+/* OBSOLETE /* Register numbers of various important registers. */
+/* OBSOLETE    Note that some of these values are "real" register numbers, */
+/* OBSOLETE    and correspond to the general registers of the machine, */
+/* OBSOLETE    and some are "phony" register numbers which are too large */
+/* OBSOLETE    to be actual register numbers as far as the user is concerned */
+/* OBSOLETE    but do serve to get the desired values when passed to read_register.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define AP_REGNUM FP_REGNUM */
+/* OBSOLETE #define FP_REGNUM 10		/* Contains address of executing stack frame */ */
+/* OBSOLETE #define SP_REGNUM 9		/* Contains address of top of stack */ */
+/* OBSOLETE #define PC_REGNUM 8		/* Contains program counter */ */
+/* OBSOLETE #define PS_REGNUM 11		/* Contains processor status */ */
+/* OBSOLETE #define FPS_REGNUM 12		/* Floating point status register */ */
+/* OBSOLETE #define FP0_REGNUM 13		/* Floating point register 0 */ */
+/* OBSOLETE #define LP0_REGNUM 21		/* Double register 0 (same as FP0) */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
+/* OBSOLETE    register state, the array `registers'.  */ */
+/* OBSOLETE #define REGISTER_BYTES ((NUM_REGS - 4) * sizeof (int) + 4 * sizeof (double)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Index within `registers' of the first byte of the space for */
+/* OBSOLETE    register N.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_BYTE(N) ((N) >= LP0_REGNUM ? \ */
+/* OBSOLETE 	LP0_REGNUM * 4 + ((N) - LP0_REGNUM) * 8 : (N) * 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of bytes of storage in the actual machine representation */
+/* OBSOLETE    for register N.  On the 32000, all regs are 4 bytes */
+/* OBSOLETE    except for the doubled floating registers. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_RAW_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Number of bytes of storage in the program's representation */
+/* OBSOLETE    for register N.  On the 32000, all regs are 4 bytes */
+/* OBSOLETE    except for the doubled floating registers. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_VIRTUAL_SIZE(N) ((N) >= LP0_REGNUM ? 8 : 4) */
+/* OBSOLETE  */
+/* OBSOLETE /* Largest value REGISTER_RAW_SIZE can have.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define MAX_REGISTER_RAW_SIZE 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Largest value REGISTER_VIRTUAL_SIZE can have.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Return the GDB type object for the "standard" data type */
+/* OBSOLETE    of data in register N.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N) \ */
+/* OBSOLETE   ((N) >= FP0_REGNUM ?		\ */
+/* OBSOLETE     ((N) >= LP0_REGNUM ?	\ */
+/* OBSOLETE      builtin_type_double	\ */
+/* OBSOLETE      : builtin_type_float)	\ */
+/* OBSOLETE    : builtin_type_int) */
+/* OBSOLETE  */
+/* OBSOLETE /* Store the address of the place in which to copy the structure the */
+/* OBSOLETE    subroutine will return.  This is called from call_function. */
+/* OBSOLETE  */
+/* OBSOLETE    On this machine this is a no-op, as gcc doesn't run on it yet. */
+/* OBSOLETE    This calling convention is not used. */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STORE_STRUCT_RETURN(ADDR, SP) */
+/* OBSOLETE  */
+/* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
+/* OBSOLETE    a function return value of type TYPE, and copy that, in virtual format, */
+/* OBSOLETE    into VALBUF.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ */
+/* OBSOLETE   memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Write into appropriate registers a function return value */
+/* OBSOLETE    of type TYPE, given in virtual format.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define STORE_RETURN_VALUE(TYPE,VALBUF) \ */
+/* OBSOLETE   write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
+/* OBSOLETE    the address in which a function should return its structure value, */
+/* OBSOLETE    as a CORE_ADDR (or an expression that can be used as one).  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(int *)(REGBUF)) */
+/* OBSOLETE  */
+/* OBSOLETE /* Describe the pointer in each stack frame to the previous stack frame */
+/* OBSOLETE    (its caller).  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* FRAME_CHAIN takes a frame's nominal address */
+/* OBSOLETE    and produces the frame's chain-pointer. */ */
+/* OBSOLETE  */
+/* OBSOLETE /* In the case of the Merlin, the frame's nominal address is the FP value, */
+/* OBSOLETE    and at that address is saved previous FP value as a 4-byte word.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_CHAIN(thisframe)  \ */
+/* OBSOLETE   (!inside_entry_file ((thisframe)->pc) ? \ */
+/* OBSOLETE    read_memory_integer ((thisframe)->frame, 4) :\ */
+/* OBSOLETE    0) */
+/* OBSOLETE  */
+/* OBSOLETE /* Define other aspects of the stack frame.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4)) */
+/* OBSOLETE  */
+/* OBSOLETE /* compute base of arguments */ */
+/* OBSOLETE #define FRAME_ARGS_ADDRESS(fi) ((fi)->frame) */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame) */
+/* OBSOLETE  */
+/* OBSOLETE /* Return number of args passed to a frame. */
+/* OBSOLETE    Can return -1, meaning no way to tell.  */ */
+/* OBSOLETE  */
+/* OBSOLETE extern int merlin_frame_num_args (struct frame_info *fi); */
+/* OBSOLETE #define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi))) */
+/* OBSOLETE  */
+/* OBSOLETE /* Return number of bytes at start of arglist that are not really args.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_ARGS_SKIP 8 */
+/* OBSOLETE  */
+/* OBSOLETE /* Put here the code to store, into a struct frame_saved_regs, */
+/* OBSOLETE    the addresses of the saved registers of frame described by FRAME_INFO. */
+/* OBSOLETE    This includes special registers such as pc and fp saved in special */
+/* OBSOLETE    ways in the stack frame.  sp is even more special: */
+/* OBSOLETE    the address we return for it IS the sp for the next frame.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \ */
+/* OBSOLETE { int regmask,regnum;						\ */
+/* OBSOLETE   int localcount;						\ */
+/* OBSOLETE   CORE_ADDR enter_addr;						\ */
+/* OBSOLETE   CORE_ADDR next_addr;						\ */
+/* OBSOLETE 								\ */
+/* OBSOLETE   enter_addr = get_pc_function_start ((frame_info)->pc);	\ */
+/* OBSOLETE   regmask = read_memory_integer (enter_addr+1, 1);		\ */
+/* OBSOLETE   localcount = ns32k_localcount (enter_addr);			\ */
+/* OBSOLETE   next_addr = (frame_info)->frame + localcount;			\ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++, regmask >>= 1)		\ */
+/* OBSOLETE     (frame_saved_regs).regs[regnum]				\ */
+/* OBSOLETE       = (regmask & 1) ? (next_addr -= 4) : 0;			\ */
+/* OBSOLETE   (frame_saved_regs).regs[SP_REGNUM] = (frame_info)->frame + 4;	\ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4;	\ */
+/* OBSOLETE   (frame_saved_regs).regs[FP_REGNUM]				\ */
+/* OBSOLETE      = read_memory_integer ((frame_info)->frame, 4); } */
+/* OBSOLETE  */
+/* OBSOLETE  */
+/* OBSOLETE /* Things needed for making the inferior call functions.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Push an empty stack frame, to record the current PC, etc.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define PUSH_DUMMY_FRAME \ */
+/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);	\ */
+/* OBSOLETE   register int regnum;					\ */
+/* OBSOLETE   sp = push_word (sp, read_register (PC_REGNUM));	\ */
+/* OBSOLETE   sp = push_word (sp, read_register (FP_REGNUM));	\ */
+/* OBSOLETE   write_register (FP_REGNUM, sp);			\ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++)  		\ */
+/* OBSOLETE     sp = push_word (sp, read_register (regnum));	\ */
+/* OBSOLETE   write_register (SP_REGNUM, sp);  			\ */
+/* OBSOLETE } */
+/* OBSOLETE  */
+/* OBSOLETE /* Discard from the stack the innermost frame, restoring all registers.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define POP_FRAME  \ */
+/* OBSOLETE { register struct frame_info *frame = get_current_frame ();	 \ */
+/* OBSOLETE   register CORE_ADDR fp;					 \ */
+/* OBSOLETE   register int regnum;						 \ */
+/* OBSOLETE   struct frame_saved_regs fsr;					 \ */
+/* OBSOLETE   struct frame_info *fi;						 \ */
+/* OBSOLETE   fp = frame->frame;						 \ */
+/* OBSOLETE   get_frame_saved_regs (frame, &fsr);				 \ */
+/* OBSOLETE   for (regnum = 0; regnum < 8; regnum++)			 \ */
+/* OBSOLETE     if (fsr.regs[regnum])					 \ */
+/* OBSOLETE       write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \ */
+/* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp, 4));	 \ */
+/* OBSOLETE   write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));   \ */
+/* OBSOLETE   write_register (SP_REGNUM, fp + 8);				 \ */
+/* OBSOLETE   flush_cached_frames ();					 \ */
+/* OBSOLETE } */
+/* OBSOLETE  */
+/* OBSOLETE /* This sequence of words is the instructions */
+/* OBSOLETE    enter        0xff,0          82 ff 00 */
+/* OBSOLETE    jsr  @0x00010203     7f ae c0 01 02 03 */
+/* OBSOLETE    adjspd       0x69696969      7f a5 01 02 03 04 */
+/* OBSOLETE    bpt                  f2 */
+/* OBSOLETE    Note this is 16 bytes.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 } */
+/* OBSOLETE  */
+/* OBSOLETE #define CALL_DUMMY_START_OFFSET	3 */
+/* OBSOLETE #define CALL_DUMMY_LENGTH	16 */
+/* OBSOLETE #define CALL_DUMMY_ADDR		5 */
+/* OBSOLETE #define CALL_DUMMY_NARGS	11 */
+/* OBSOLETE  */
+/* OBSOLETE /* Insert the specified number of args and function address */
+/* OBSOLETE    into a call sequence of the above form stored at DUMMYNAME.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   		\ */
+/* OBSOLETE { int flipped = fun | 0xc0000000;				\ */
+/* OBSOLETE   flip_bytes (&flipped, 4);					\ */
+/* OBSOLETE   *((int *) (((char *) dummyname)+CALL_DUMMY_ADDR)) = flipped;	\ */
+/* OBSOLETE   flipped = - nargs * 4;					\ */
+/* OBSOLETE   flip_bytes (&flipped, 4);					\ */
+/* OBSOLETE   *((int *) (((char *) dummyname)+CALL_DUMMY_NARGS)) = flipped;	\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
index 48806b3..f192657 100644
--- a/gdb/config/ns32k/tm-ns32km3.h
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -1,74 +1,74 @@
-/* Macro definitions for ns532, Mach 3.0
-   Copyright 1992, 1993, 1994 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.  */
-
-/* Include common definitions for Mach3 systems */
-#include "nm-m3.h"
-
-/* Define offsets to access CPROC stack when it does not have
- * a kernel thread.
- */
-#define MACHINE_CPROC_SP_OFFSET 20
-#define MACHINE_CPROC_PC_OFFSET 16
-#define MACHINE_CPROC_FP_OFFSET 12
-
-#include <ns532/psl.h>
-#include <ns532/vmparam.h>
-
-/* Thread flavors used in re-setting the T bit.
- * @@ this is also bad for cross debugging.
- */
-#define TRACE_FLAVOR		NS532_THREAD_STATE
-#define TRACE_FLAVOR_SIZE	NS532_THREAD_STATE_COUNT
-#define TRACE_SET(x,state) \
-  	((struct ns532_thread_state *)state)->psr |= PSR_T
-#define TRACE_CLEAR(x,state) \
-  	((((struct ns532_thread_state *)state)->psr &= ~PSR_T), 1)
-
-/* we can do it */
-#define ATTACH_DETACH 1
-
-/* Address of end of stack space.
- * for MACH, see <ns532/vmparam.h>
- */
-#define STACK_END_ADDR USRSTACK
-
-#include "ns32k/tm-umax.h"
-
-/* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */
-#undef REGISTER_NAMES
-#undef NUM_REGS
-#undef REGISTER_BYTES
-/* Initializer for an array of names of registers.
-   There should be NUM_REGS strings in this initializer.  */
-
-#define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\
- 			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\
-			"sp", "fp", "pc", "ps",				\
- 			"fsr",						\
-			"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", "xx",			\
- 			}
-
-#define NUM_REGS		29
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#define REGISTER_BYTES \
-  ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \
-   + 8            * REGISTER_RAW_SIZE(LP0_REGNUM))
+/* OBSOLETE /* Macro definitions for ns532, Mach 3.0 */
+/* OBSOLETE    Copyright 1992, 1993, 1994 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE /* Include common definitions for Mach3 systems */ */
+/* OBSOLETE #include "nm-m3.h" */
+/* OBSOLETE  */
+/* OBSOLETE /* Define offsets to access CPROC stack when it does not have */
+/* OBSOLETE  * a kernel thread. */
+/* OBSOLETE  */ */
+/* OBSOLETE #define MACHINE_CPROC_SP_OFFSET 20 */
+/* OBSOLETE #define MACHINE_CPROC_PC_OFFSET 16 */
+/* OBSOLETE #define MACHINE_CPROC_FP_OFFSET 12 */
+/* OBSOLETE  */
+/* OBSOLETE #include <ns532/psl.h> */
+/* OBSOLETE #include <ns532/vmparam.h> */
+/* OBSOLETE  */
+/* OBSOLETE /* Thread flavors used in re-setting the T bit. */
+/* OBSOLETE  * @@ this is also bad for cross debugging. */
+/* OBSOLETE  */ */
+/* OBSOLETE #define TRACE_FLAVOR		NS532_THREAD_STATE */
+/* OBSOLETE #define TRACE_FLAVOR_SIZE	NS532_THREAD_STATE_COUNT */
+/* OBSOLETE #define TRACE_SET(x,state) \ */
+/* OBSOLETE   	((struct ns532_thread_state *)state)->psr |= PSR_T */
+/* OBSOLETE #define TRACE_CLEAR(x,state) \ */
+/* OBSOLETE   	((((struct ns532_thread_state *)state)->psr &= ~PSR_T), 1) */
+/* OBSOLETE  */
+/* OBSOLETE /* we can do it */ */
+/* OBSOLETE #define ATTACH_DETACH 1 */
+/* OBSOLETE  */
+/* OBSOLETE /* Address of end of stack space. */
+/* OBSOLETE  * for MACH, see <ns532/vmparam.h> */
+/* OBSOLETE  */ */
+/* OBSOLETE #define STACK_END_ADDR USRSTACK */
+/* OBSOLETE  */
+/* OBSOLETE #include "ns32k/tm-umax.h" */
+/* OBSOLETE  */
+/* OBSOLETE /* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */ */
+/* OBSOLETE #undef REGISTER_NAMES */
+/* OBSOLETE #undef NUM_REGS */
+/* OBSOLETE #undef REGISTER_BYTES */
+/* OBSOLETE /* Initializer for an array of names of registers. */
+/* OBSOLETE    There should be NUM_REGS strings in this initializer.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_NAMES {"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",	\ */
+/* OBSOLETE  			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\ */
+/* OBSOLETE 			"sp", "fp", "pc", "ps",				\ */
+/* OBSOLETE  			"fsr",						\ */
+/* OBSOLETE 			"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", "xx",			\ */
+/* OBSOLETE  			} */
+/* OBSOLETE  */
+/* OBSOLETE #define NUM_REGS		29 */
+/* OBSOLETE  */
+/* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
+/* OBSOLETE    register state, the array `registers'.  */ */
+/* OBSOLETE #define REGISTER_BYTES \ */
+/* OBSOLETE   ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \ */
+/* OBSOLETE    + 8            * REGISTER_RAW_SIZE(LP0_REGNUM)) */
diff --git a/gdb/config/ns32k/umax.mh b/gdb/config/ns32k/umax.mh
index e43f6ec..741fe0a 100644
--- a/gdb/config/ns32k/umax.mh
+++ b/gdb/config/ns32k/umax.mh
@@ -1,5 +1,5 @@
-# Host: Encore running umax 4.2
-XDEPFILES= umax-xdep.o
-XM_FILE= xm-umax.h
-NAT_FILE= nm-umax.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o
+# OBSOLETE # Host: Encore running umax 4.2
+# OBSOLETE XDEPFILES= umax-xdep.o
+# OBSOLETE XM_FILE= xm-umax.h
+# OBSOLETE NAT_FILE= nm-umax.h
+# OBSOLETE NATDEPFILES= infptrace.o inftarg.o fork-child.o
diff --git a/gdb/config/ns32k/umax.mt b/gdb/config/ns32k/umax.mt
index 4c9169d..00987f1 100644
--- a/gdb/config/ns32k/umax.mt
+++ b/gdb/config/ns32k/umax.mt
@@ -1,3 +1,3 @@
-# Target: Encore running umax 4.2
-TDEPFILES= ns32k-tdep.o
-TM_FILE= tm-umax.h
+# OBSOLETE # Target: Encore running umax 4.2
+# OBSOLETE TDEPFILES= ns32k-tdep.o
+# OBSOLETE TM_FILE= tm-umax.h
diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
index f08f517..e2dacbe 100644
--- a/gdb/config/ns32k/xm-merlin.h
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -1,67 +1,67 @@
-/* Definitions to make GDB run on a merlin under utek 2.1
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 2001
-   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.  */
-
-#include <machine/reg.h>
-
-/* This machine doesn't have the siginterrupt call.  */
-#define NO_SIGINTERRUPT
-
-/* Under Utek, a ptrace'd process can be the only active process for
-   an executable.  Therefore instead of /bin/sh use gdb-sh (which should
-   just be a copy of /bin/sh which is world readable and writeable).  */
-/* FIXME: name should be passed in from Makefile so it can use prefix.  */
-#define SHELL_FILE "/usr/local/lib/gdb-sh"
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* This is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-
-#define KERNEL_U_ADDR (0xfef000)
-
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-{ 									\
-  switch (regno) {							\
-  case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\
-	addr = blockend + (R0 - regno) * sizeof (int); break;		\
-  case PC_REGNUM:							\
-  	addr = blockend + PC * sizeof (int); break;			\
-  case SP_REGNUM:							\
-  	addr = blockend + SP * sizeof (int); break;			\
-  case FP_REGNUM:							\
-  	addr = blockend + FP * sizeof (int); break;			\
-  case PS_REGNUM:							\
-  	addr = blockend + 12 * sizeof (int); break;			\
-  case FPS_REGNUM:							\
-  	addr = 108; break;						\
-  case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\
-  case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\
-  case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\
-  case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\
-  	addr = 76 + (regno - FP0_REGNUM) * sizeof (float); break;	\
-  case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\
-  case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\
-  	addr = 76 + (regno - LP0_REGNUM) * sizeof (double); break;	\
-  default:								\
-  	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
-  }									\
-}
+/* OBSOLETE /* Definitions to make GDB run on a merlin under utek 2.1 */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1992, 1993, 2001 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #include <machine/reg.h> */
+/* OBSOLETE  */
+/* OBSOLETE /* This machine doesn't have the siginterrupt call.  */ */
+/* OBSOLETE #define NO_SIGINTERRUPT */
+/* OBSOLETE  */
+/* OBSOLETE /* Under Utek, a ptrace'd process can be the only active process for */
+/* OBSOLETE    an executable.  Therefore instead of /bin/sh use gdb-sh (which should */
+/* OBSOLETE    just be a copy of /bin/sh which is world readable and writeable).  */ */
+/* OBSOLETE /* FIXME: name should be passed in from Makefile so it can use prefix.  */ */
+/* OBSOLETE #define SHELL_FILE "/usr/local/lib/gdb-sh" */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* This is the amount to subtract from u.u_ar0 */
+/* OBSOLETE    to get the offset in the core file of the register values.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define KERNEL_U_ADDR (0xfef000) */
+/* OBSOLETE  */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) \ */
+/* OBSOLETE { 									\ */
+/* OBSOLETE   switch (regno) {							\ */
+/* OBSOLETE   case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	\ */
+/* OBSOLETE 	addr = blockend + (R0 - regno) * sizeof (int); break;		\ */
+/* OBSOLETE   case PC_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + PC * sizeof (int); break;			\ */
+/* OBSOLETE   case SP_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + SP * sizeof (int); break;			\ */
+/* OBSOLETE   case FP_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + FP * sizeof (int); break;			\ */
+/* OBSOLETE   case PS_REGNUM:							\ */
+/* OBSOLETE   	addr = blockend + 12 * sizeof (int); break;			\ */
+/* OBSOLETE   case FPS_REGNUM:							\ */
+/* OBSOLETE   	addr = 108; break;						\ */
+/* OBSOLETE   case FP0_REGNUM + 0: case FP0_REGNUM + 1:				\ */
+/* OBSOLETE   case FP0_REGNUM + 2: case FP0_REGNUM + 3: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 4: case FP0_REGNUM + 5: 				\ */
+/* OBSOLETE   case FP0_REGNUM + 6: case FP0_REGNUM + 7: 				\ */
+/* OBSOLETE   	addr = 76 + (regno - FP0_REGNUM) * sizeof (float); break;	\ */
+/* OBSOLETE   case LP0_REGNUM + 0: case LP0_REGNUM + 1:				\ */
+/* OBSOLETE   case LP0_REGNUM + 2: case LP0_REGNUM + 3:				\ */
+/* OBSOLETE   	addr = 76 + (regno - LP0_REGNUM) * sizeof (double); break;	\ */
+/* OBSOLETE   default:								\ */
+/* OBSOLETE   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\ */
+/* OBSOLETE 	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\ */
+/* OBSOLETE   }									\ */
+/* OBSOLETE } */
diff --git a/gdb/config/ns32k/xm-ns32km3.h b/gdb/config/ns32k/xm-ns32km3.h
index 465db81..ab4b8a4 100644
--- a/gdb/config/ns32k/xm-ns32km3.h
+++ b/gdb/config/ns32k/xm-ns32km3.h
@@ -1,25 +1,25 @@
-/* Definitions to make GDB run on Mach 3 on an National ns32k
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1995, 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.  */
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* Do implement the attach and detach commands.  */
-#define ATTACH_DETACH	1
+/* OBSOLETE /* Definitions to make GDB run on Mach 3 on an National ns32k */
+/* OBSOLETE    Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1995, 1996 */
+/* OBSOLETE    Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE /* Do implement the attach and detach commands.  */ */
+/* OBSOLETE #define ATTACH_DETACH	1 */
diff --git a/gdb/config/ns32k/xm-umax.h b/gdb/config/ns32k/xm-umax.h
index b7f4dad..8fe762d 100644
--- a/gdb/config/ns32k/xm-umax.h
+++ b/gdb/config/ns32k/xm-umax.h
@@ -1,26 +1,26 @@
-/* Definitions to make GDB run on an encore under umax 4.2
-   Copyright 1987, 1989, 1992 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.  */
-
-#define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-#define HAVE_WAIT_STRUCT
-
-/* Doesn't have siginterupt.  */
-#define NO_SIGINTERRUPT
+/* OBSOLETE /* Definitions to make GDB run on an encore under umax 4.2 */
+/* OBSOLETE    Copyright 1987, 1989, 1992 Free Software Foundation, Inc. */
+/* OBSOLETE  */
+/* OBSOLETE    This file is part of GDB. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is free software; you can redistribute it and/or modify */
+/* OBSOLETE    it under the terms of the GNU General Public License as published by */
+/* OBSOLETE    the Free Software Foundation; either version 2 of the License, or */
+/* OBSOLETE    (at your option) any later version. */
+/* OBSOLETE  */
+/* OBSOLETE    This program is distributed in the hope that it will be useful, */
+/* OBSOLETE    but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* OBSOLETE    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the */
+/* OBSOLETE    GNU General Public License for more details. */
+/* OBSOLETE  */
+/* OBSOLETE    You should have received a copy of the GNU General Public License */
+/* OBSOLETE    along with this program; if not, write to the Free Software */
+/* OBSOLETE    Foundation, Inc., 59 Temple Place - Suite 330, */
+/* OBSOLETE    Boston, MA 02111-1307, USA.  */ */
+/* OBSOLETE  */
+/* OBSOLETE #define HOST_BYTE_ORDER LITTLE_ENDIAN */
+/* OBSOLETE  */
+/* OBSOLETE #define HAVE_WAIT_STRUCT */
+/* OBSOLETE  */
+/* OBSOLETE /* Doesn't have siginterupt.  */ */
+/* OBSOLETE #define NO_SIGINTERRUPT */