Initial creation of sourceware repositorygdb-4_18-branchpoint

18 files changed, 1105 insertions, 0 deletions

diff --git a/gdb/config/ns32k/merlin.mh b/gdb/config/ns32k/merlin.mh
new file mode 100644
index 0000000..f9c3e7b
--- /dev/null
+++ b/gdb/config/ns32k/merlin.mh
@@ -0,0 +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
diff --git a/gdb/config/ns32k/merlin.mt b/gdb/config/ns32k/merlin.mt
new file mode 100644
index 0000000..b346077
--- /dev/null
+++ b/gdb/config/ns32k/merlin.mt
@@ -0,0 +1,3 @@
+# Target: Merlin running utek 2.1
+TDEPFILES= ns32k-tdep.o
+TM_FILE= tm-merlin.h
diff --git a/gdb/config/ns32k/nbsd.mh b/gdb/config/ns32k/nbsd.mh
new file mode 100644
index 0000000..aae025b
--- /dev/null
+++ b/gdb/config/ns32k/nbsd.mh
@@ -0,0 +1,5 @@
+# Host: PC532 running NetBSD
+XDEPFILES= ser-tcp.o
+XM_FILE= xm-nbsd.h
+NAT_FILE= nm-nbsd.h
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o ns32knbsd-nat.o
diff --git a/gdb/config/ns32k/nbsd.mt b/gdb/config/ns32k/nbsd.mt
new file mode 100644
index 0000000..512132a
--- /dev/null
+++ b/gdb/config/ns32k/nbsd.mt
@@ -0,0 +1,3 @@
+# Target: PC532 running NetBSD
+TDEPFILES= ns32k-tdep.o solib.o
+TM_FILE= tm-nbsd.h
diff --git a/gdb/config/ns32k/nm-nbsd.h b/gdb/config/ns32k/nm-nbsd.h
new file mode 100644
index 0000000..cef536e
--- /dev/null
+++ b/gdb/config/ns32k/nm-nbsd.h
@@ -0,0 +1,36 @@
+/* Native-dependent definitions for ns32k running NetBSD, for GDB.
+   Copyright 1986, 1987, 1989, 1992, 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.  */
+
+#ifndef NM_NBSD_H
+#define NM_NBSD_H
+
+/* Get generic NetBSD native definitions. */
+#include "nm-nbsd.h"
+
+#if 0
+#define FLOAT_INFO	{ extern ns32k_float_info(); ns32k_float_info(); }
+#endif
+
+#define REGISTER_U_ADDR(addr, blockend, regno) \
+	(addr) = ns32k_register_u_addr ((blockend),(regno));
+
+extern int
+ns32k_register_u_addr PARAMS ((int, int));
+
+#endif /* NM_NBSD_H */
diff --git a/gdb/config/ns32k/nm-umax.h b/gdb/config/ns32k/nm-umax.h
new file mode 100644
index 0000000..add6e70
--- /dev/null
+++ b/gdb/config/ns32k/nm-umax.h
@@ -0,0 +1,54 @@
+/* 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.  */
+
+/* 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);		\
+	abort ();							\
+  }									\
+}
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
new file mode 100644
index 0000000..7f0992a
--- /dev/null
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -0,0 +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
diff --git a/gdb/config/ns32k/ns32km3.mt b/gdb/config/ns32k/ns32km3.mt
new file mode 100644
index 0000000..9391176
--- /dev/null
+++ b/gdb/config/ns32k/ns32km3.mt
@@ -0,0 +1,3 @@
+# Target: ns32k with a.out on Mach 3
+TDEPFILES= ns32k-tdep.o 
+TM_FILE= tm-ns32km3.h
diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
new file mode 100644
index 0000000..f90c5e7
--- /dev/null
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -0,0 +1,313 @@
+/* Definitions to target GDB to a merlin under utek 2.1
+   Copyright 1986, 1987, 1989, 1991, 1993 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 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.  */
+
+#define SKIP_PROLOGUE(pc)   				\
+{ register int op = read_memory_integer (pc, 1);	\
+  if (op == 0x82)					\
+    { op = read_memory_integer (pc+2,1);		\
+      if ((op & 0x80) == 0) pc += 3;			\
+      else if ((op & 0xc0) == 0x80) pc += 4;		\
+      else pc += 6;					\
+    }}
+
+/* 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.  */
+
+#define FRAME_NUM_ARGS(numargs, fi)			\
+{ CORE_ADDR pc;						\
+  int insn;						\
+  int addr_mode;					\
+  int width;						\
+							\
+  pc = FRAME_SAVED_PC (fi);				\
+  insn = read_memory_integer (pc,2);			\
+  addr_mode = (insn >> 11) & 0x1f;			\
+  insn = insn & 0x7ff;					\
+  if ((insn & 0x7fc) == 0x57c				\
+      && addr_mode == 0x14) /* immediate */		\
+    { if (insn == 0x57c) /* adjspb */			\
+	width = 1;					\
+      else if (insn == 0x57d) /* adjspw */		\
+	width = 2;					\
+      else if (insn == 0x57f) /* adjspd */		\
+	width = 4;					\
+      numargs = read_memory_integer (pc+2,width);	\
+      if (width > 1)					\
+	flip_bytes (&numargs, width);			\
+      numargs = - sign_extend (numargs, width*8) / 4; }	\
+  else numargs = -1;					\
+}
+
+/* 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;	\
+}
diff --git a/gdb/config/ns32k/tm-nbsd.h b/gdb/config/ns32k/tm-nbsd.h
new file mode 100644
index 0000000..6e61de3
--- /dev/null
+++ b/gdb/config/ns32k/tm-nbsd.h
@@ -0,0 +1,79 @@
+/* Macro definitions for ns32k running under NetBSD.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993 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.  */
+
+/* Override number of expected traps from sysv. */
+#define START_INFERIOR_TRAPS_EXPECTED 2
+
+/* Most definitions from umax could be used. */
+
+#include "ns32k/tm-umax.h"
+
+/* Generic NetBSD definitions.  */
+
+#include "tm-nbsd.h"
+
+/* Saved Pc.  Get it from sigcontext if within sigtramp.  */
+
+/* Offset to saved PC in sigcontext, from <machine/signal.h>.  */
+#define SIGCONTEXT_PC_OFFSET 20
+
+#undef FRAME_SAVED_PC(FRAME)
+#define FRAME_SAVED_PC(FRAME) \
+  (((FRAME)->signal_handler_caller \
+    ? sigtramp_saved_pc (FRAME) \
+    : read_memory_integer ((FRAME)->frame + 4, 4)) \
+   )
+
+
+/* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */
+#undef REGISTER_NAMES
+#undef NUM_REGS
+#undef REGISTER_BYTES
+#undef  REGISTER_BYTE
+/* 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))
+
+/* Index within `registers' of the first byte of the space for
+   register N.  */
+
+/* This is a bit yuck. The even numbered double precision floating
+   point long registers occupy the same space as the even:odd numbered
+   single precision floating point registers, but the extra 32381 fpu
+   registers are at the end. Doing it this way is compatable for both
+   32081 and 32381 equiped machines. */
+
+#define REGISTER_BYTE(N) (((N) < LP0_REGNUM? (N)\
+			   : ((N) - LP0_REGNUM) & 1? (N) - 1 \
+			   : ((N) - LP0_REGNUM + FP0_REGNUM)) * 4)
+
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
new file mode 100644
index 0000000..27d07d7
--- /dev/null
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -0,0 +1,73 @@
+/* Macro definitions for ns532, Mach 3.0
+   Copyright (C) 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.  */
+
+/* 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))
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
new file mode 100644
index 0000000..1fdfb2f
--- /dev/null
+++ b/gdb/config/ns32k/tm-umax.h
@@ -0,0 +1,370 @@
+/* Definitions to make GDB run on an encore under umax 4.2
+   Copyright 1987, 1989, 1991, 1993 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.  */
+
+/* This is also included by tm-ns32km3.h, as well as being used by umax.  */
+
+#define TARGET_BYTE_ORDER LITTLE_ENDIAN
+
+/* Need to get function ends by adding this to epilogue address from .bf
+   record, not using x_fsize field.  */
+#define FUNCTION_EPILOGUE_SIZE 4
+
+/* 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.  */
+
+#define SKIP_PROLOGUE(pc)   				\
+{ register unsigned char op = read_memory_integer (pc, 1);	\
+  if (op == 0x82) { op = read_memory_integer (pc+2,1);  \
+  		    if ((op & 0x80) == 0) pc += 3;	\
+		    else if ((op & 0xc0) == 0x80) pc += 4;	\
+		    else pc += 6;			\
+		   }					\
+}
+
+/* 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.  */
+
+#ifndef STACK_END_ADDR
+#define STACK_END_ADDR (0xfffff000)
+#endif
+
+/* 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
+
+#if 0 /* Disable until fixed *correctly*.  */
+#ifndef INVALID_FLOAT
+#ifndef NaN
+#include <nan.h>
+#endif NaN
+
+/* Return 1 if P points to an invalid floating point value.  */
+/* Surely wrong for cross-debugging.  */
+#define INVALID_FLOAT(p, s) \
+	 ((s == sizeof (float))?	\
+		NaF (*(float *) p) :	\
+		NaD (*(double *) p))
+#endif /* INVALID_FLOAT */
+#endif
+
+/* 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",	\
+ 			"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",	\
+			"sp", "fp", "pc", "ps",				\
+ 			"fsr",						\
+			"l0", "l1", "l2", "l3", "xx",			\
+ 			}
+
+/* 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	R0_REGNUM 0		/* General register 0 */
+#define FP0_REGNUM 8		/* Floating point register 0 */
+#define SP_REGNUM 16		/* Contains address of top of stack */
+#define AP_REGNUM FP_REGNUM
+#define FP_REGNUM 17		/* Contains address of executing stack frame */
+#define PC_REGNUM 18		/* Contains program counter */
+#define PS_REGNUM 19		/* Contains processor status */
+#define FPS_REGNUM 20		/* Floating point status register */
+#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) * REGISTER_RAW_SIZE(R0_REGNUM) \
+   + 4            * REGISTER_RAW_SIZE(LP0_REGNUM))
+
+/* 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) ?				\
+		builtin_type_int :			\
+		((N) < FP0_REGNUM + 8) ?		\
+			builtin_type_float :		\
+			((N) < LP0_REGNUM) ?		\
+				builtin_type_int :	\
+				builtin_type_double)
+
+/* 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, because gcc isn't used on it
+   yet.  So 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+REGISTER_BYTE (TYPE_CODE (TYPE) == TYPE_CODE_FLT ? FP0_REGNUM : 0), 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 (REGISTER_BYTE (TYPE_CODE (TYPE) == TYPE_CODE_FLT ? FP0_REGNUM : 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 ns32000 series, 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)	\
+  ((ns32k_get_enter_addr ((fi)->pc) > 1) ? \
+	((fi)->frame) : (read_register (SP_REGNUM) - 4))
+
+#define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame)
+
+/* Get the address of the enter opcode for this function, if it is active.
+   Returns positive address > 1 if pc is between enter/exit,
+   1 if pc before enter or after exit, 0 otherwise. */
+
+extern CORE_ADDR ns32k_get_enter_addr ();
+
+/* Return number of args passed to a frame.
+   Can return -1, meaning no way to tell.
+   Encore's C compiler often reuses same area on stack for args,
+   so this will often not work properly.  If the arg names
+   are known, it's likely most of them will be printed. */
+
+#define FRAME_NUM_ARGS(numargs, fi)			\
+{ CORE_ADDR	pc;					\
+  CORE_ADDR	enter_addr;				\
+  unsigned int	insn;					\
+  unsigned int	addr_mode;				\
+  int width;						\
+							\
+  numargs = -1;						\
+  enter_addr = ns32k_get_enter_addr ((fi)->pc);		\
+  if (enter_addr > 0)					\
+    {							\
+      pc = (enter_addr == 1) ?				\
+	SAVED_PC_AFTER_CALL (fi) :			\
+	FRAME_SAVED_PC (fi);				\
+      insn = read_memory_integer (pc,2);		\
+      addr_mode = (insn >> 11) & 0x1f;			\
+      insn = insn & 0x7ff;				\
+      if ((insn & 0x7fc) == 0x57c &&			\
+		addr_mode == 0x14) /* immediate */	\
+	{						\
+	  if (insn == 0x57c) /* adjspb */		\
+  		width = 1;				\
+	  else if (insn == 0x57d) /* adjspw */		\
+  		width = 2;				\
+	  else if (insn == 0x57f) /* adjspd */		\
+  		width = 4;				\
+	  numargs = read_memory_integer (pc+2,width);	\
+	  if (width > 1)				\
+	    flip_bytes (&numargs, width);		\
+	  numargs = - sign_extend (numargs, width*8) / 4;\
+	}						\
+    }							\
+}
+
+/* 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)	\
+{ 								\
+  register int	regmask, regnum;				\
+  int		localcount;					\
+  register CORE_ADDR	enter_addr;				\
+  register CORE_ADDR	next_addr;				\
+								\
+  memset (&(frame_saved_regs), '\0', sizeof (frame_saved_regs));	\
+  enter_addr = ns32k_get_enter_addr ((frame_info)->pc);		\
+  if (enter_addr > 1)						\
+    {								\
+      regmask = read_memory_integer (enter_addr+1, 1) & 0xff;	\
+      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));\
+    }								\
+  else if (enter_addr == 1)					\
+    {								\
+      CORE_ADDR sp = read_register (SP_REGNUM);			\
+      (frame_saved_regs).regs[PC_REGNUM] = sp;			\
+      (frame_saved_regs).regs[SP_REGNUM] = sp + 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;					\
+	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;	\
+}
diff --git a/gdb/config/ns32k/umax.mh b/gdb/config/ns32k/umax.mh
new file mode 100644
index 0000000..e43f6ec
--- /dev/null
+++ b/gdb/config/ns32k/umax.mh
@@ -0,0 +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
diff --git a/gdb/config/ns32k/umax.mt b/gdb/config/ns32k/umax.mt
new file mode 100644
index 0000000..4c9169d
--- /dev/null
+++ b/gdb/config/ns32k/umax.mt
@@ -0,0 +1,3 @@
+# Target: Encore running umax 4.2
+TDEPFILES= ns32k-tdep.o
+TM_FILE= tm-umax.h
diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
new file mode 100644
index 0000000..b8329f6
--- /dev/null
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -0,0 +1,65 @@
+/* Definitions to make GDB run on a merlin under utek 2.1
+   Copyright 1986, 1987, 1989, 1991, 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.  */
+
+#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);		\
+	abort ();							\
+  }									\
+}
diff --git a/gdb/config/ns32k/xm-nbsd.h b/gdb/config/ns32k/xm-nbsd.h
new file mode 100644
index 0000000..db8c0bc
--- /dev/null
+++ b/gdb/config/ns32k/xm-nbsd.h
@@ -0,0 +1,21 @@
+/* Parameters for execution on a ns32k running NetBSD, for GDB.
+   Copyright 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.  */
+
+/* Get generic NetBSD host definitions. */
+#include "xm-nbsd.h"
diff --git a/gdb/config/ns32k/xm-ns32km3.h b/gdb/config/ns32k/xm-ns32km3.h
new file mode 100644
index 0000000..3d08e67
--- /dev/null
+++ b/gdb/config/ns32k/xm-ns32km3.h
@@ -0,0 +1,23 @@
+/* Definitions to make GDB run on Mach 3 on an National ns32k
+   Copyright (C) 1986, 1987, 1989, 1991 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
diff --git a/gdb/config/ns32k/xm-umax.h b/gdb/config/ns32k/xm-umax.h
new file mode 100644
index 0000000..1bb0071
--- /dev/null
+++ b/gdb/config/ns32k/xm-umax.h
@@ -0,0 +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
+