14 files changed, 17 insertions, 236 deletions
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/nbsd.mt b/gnu/usr.bin/binutils/gdb/config/vax/nbsd.mt
index fb7f8ef2705..dfe746fd520 100644
--- a/gnu/usr.bin/binutils/gdb/config/vax/nbsd.mt
+++ b/gnu/usr.bin/binutils/gdb/config/vax/nbsd.mt
@@ -1,3 +1,3 @@
 # Target: NetBSD/vax
 TDEPFILES= vax-tdep.o vaxnbsd-tdep.o corelow.o solib.o solib-svr4.o
-TM_FILE= tm-nbsd.h
+DEPRECATED_TM_FILE= solib.h
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/nm-obsd.h b/gnu/usr.bin/binutils/gdb/config/vax/nm-obsd.h
deleted file mode 100644
index ac44636408e..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/nm-obsd.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Native-dependent definitions for OpenBSD/vax.
-
-   Copyright 2004 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_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-#endif /* nm-obsd.h */
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/nm-vax.h b/gnu/usr.bin/binutils/gdb/config/vax/nm-vax.h
index 2518047290f..78313cacaf8 100644
--- a/gnu/usr.bin/binutils/gdb/config/vax/nm-vax.h
+++ b/gnu/usr.bin/binutils/gdb/config/vax/nm-vax.h
@@ -1,5 +1,6 @@
-/* Common definitions for GDB native support on Vaxen under 4.2bsd and Ultrix.
-   Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
+/* Native-dependent definitions for VAXen under 4.2 BSD and ULTRIX.
+
+   Copyright 1986, 1987, 1989, 1992, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,12 +19,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define AP_REGNUM 12	/* XXXJRT */
+#ifndef NM_VAX_H
+#define NM_VAX_H
+
+extern CORE_ADDR vax_kernel_u_addr;
+#define KERNEL_U_ADDR vax_kernel_u_addr
+
+extern CORE_ADDR vax_register_u_addr (CORE_ADDR u_ar0, int regnum);
+#define REGISTER_U_ADDR(addr, u_ar0, regnum) \
+  (addr) = vax_register_u_addr (u_ar0, regnum)
 
-#define REGISTER_U_ADDR(addr, blockend, regno)		\
-{ addr = blockend - 0110 + regno * 4;			\
-  if (regno == PC_REGNUM) addr = blockend - 8;		\
-  if (regno == PS_REGNUM) addr = blockend - 4;		\
-  if (regno == DEPRECATED_FP_REGNUM) addr = blockend - 0120;	\
-  if (regno == AP_REGNUM) addr = blockend - 0124;	\
-  if (regno == SP_REGNUM) addr = blockend - 20; }
+#endif /* nm-vax.h */
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/obsd.mh b/gnu/usr.bin/binutils/gdb/config/vax/obsd.mh
index 299a38fd330..d4d444f7939 100644
--- a/gnu/usr.bin/binutils/gdb/config/vax/obsd.mh
+++ b/gnu/usr.bin/binutils/gdb/config/vax/obsd.mh
@@ -1,5 +1,5 @@
 # Host: OpenBSD/vax
-NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= nm-obsd.h
+NATDEPFILES= fork-child.o inf-ptrace.o \
+	vaxbsd-nat.o bsd-kvm.o
 
 LOADLIBES= -lkvm
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/tm-nbsd.h b/gnu/usr.bin/binutils/gdb/config/vax/tm-nbsd.h
deleted file mode 100644
index f840c797b44..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/tm-nbsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target-dependent definitions for NetBSD/vax.
-
-   Copyright 2004 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 TM_NBSD_H
-#define TM_NBSD_H
-
-#include "solib.h"
-
-#endif /* tm-nbsd.h */
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/tm-vaxbsd.h b/gnu/usr.bin/binutils/gdb/config/vax/tm-vaxbsd.h
deleted file mode 100644
index aa34107e02d..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/tm-vaxbsd.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Definitions to make GDB run on a vax under 4.2bsd.
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1996, 1998, 1999, 2000, 2002
-   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 TM_VAXBSD_H
-#define TM_VAXBSD_H
-
-#define TARGET_UPAGES 14
-#define TARGET_NBPG 512
-#define STACK_END_ADDR (0x80000000 - (TARGET_UPAGES * TARGET_NBPG))
-
-/* On the VAX, sigtramp is in the u area.  Can't check the exact
-   addresses because for cross-debugging we don't have VAX include
-   files around.  This should be close enough.  */
-#define SIGTRAMP_START(pc)	STACK_END_ADDR
-#define SIGTRAMP_END(pc)	0x80000000
-
-#endif /* TM_VAXBSD_H */
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/vax.mt b/gnu/usr.bin/binutils/gdb/config/vax/vax.mt
index 06ab9b2b821..4d7af45813b 100644
--- a/gnu/usr.bin/binutils/gdb/config/vax/vax.mt
+++ b/gnu/usr.bin/binutils/gdb/config/vax/vax.mt
@@ -1,3 +1,2 @@
-# Target: DEC VAX running BSD or Ultrix
+# Target: VAX running 4.2BSD or Ultrix
 TDEPFILES= vax-tdep.o
-TM_FILE= tm-vaxbsd.h
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/vaxbsd.mh b/gnu/usr.bin/binutils/gdb/config/vax/vaxbsd.mh
deleted file mode 100644
index db1e1d4371d..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/vaxbsd.mh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Host: DEC VAX running BSD
-
-# The following types of /bin/cc failures have been observed:
-# 1.  Something in readline.c which I have never seen
-# 2.  ``"values.c", line 816: compiler error: schain botch''
-#msg /bin/cc has been known to fail on VAXen running BSD4.3
-#msg If this occurs, use gcc
-#msg  (but see comments in Makefile.dist about compiling with gcc).
-
-XM_FILE= xm-vaxbsd.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
-
-NAT_FILE= nm-vax.h
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/vaxult.mh b/gnu/usr.bin/binutils/gdb/config/vax/vaxult.mh
deleted file mode 100644
index f05a33fa198..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/vaxult.mh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Host: DEC VAX running Ultrix
-
-XM_FILE= xm-vaxult.h
-
-NAT_FILE= nm-vax.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/vaxult2.mh b/gnu/usr.bin/binutils/gdb/config/vax/vaxult2.mh
deleted file mode 100644
index 4170a841257..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/vaxult2.mh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Host: DEC VAX running Ultrix
-
-XM_FILE= xm-vaxult2.h
-
-NAT_FILE= nm-vax.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/xm-vax.h b/gnu/usr.bin/binutils/gdb/config/vax/xm-vax.h
deleted file mode 100644
index 9924f260140..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/xm-vax.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Common definitions to make GDB run on Vaxen under 4.2bsd and Ultrix.
-   Copyright (C) 1986, 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.  */
-
-/* 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 (0x80000000 - (UPAGES * NBPG))
-
-/* Kernel is a bit tenacious about sharing text segments, disallowing bpts.  */
-#define	ONE_PROCESS_WRITETEXT
-
-/* Interface definitions for kernel debugger KDB.  */
-
-/* Map machine fault codes into signal numbers.
-   First subtract 0, divide by 4, then index in a table.
-   Faults for which the entry in this table is 0
-   are not handled by KDB; the program's own trap handler
-   gets to handle then.  */
-
-#define FAULT_CODE_ORIGIN 0
-#define FAULT_CODE_UNITS 4
-#define FAULT_TABLE    \
-{ 0, SIGKILL, SIGSEGV, 0, 0, 0, 0, 0, \
-  0, 0, SIGTRAP, SIGTRAP, 0, 0, 0, 0, \
-  0, 0, 0, 0, 0, 0, 0, 0}
-
-/* Start running with a stack stretching from BEG to END.
-   BEG and END should be symbols meaningful to the assembler.
-   This is used only for kdb.  */
-
-#define INIT_STACK(beg, end)  \
-{ asm (".globl end");         \
-  asm ("movl $ end, sp");      \
-  asm ("clrl fp"); }
-
-/* Push the frame pointer register on the stack.  */
-#define PUSH_FRAME_PTR        \
-  asm ("pushl fp");
-
-/* Copy the top-of-stack to the frame pointer register.  */
-#define POP_FRAME_PTR  \
-  asm ("movl (sp), fp");
-
-/* After KDB is entered by a fault, push all registers
-   that GDB thinks about (all NUM_REGS of them),
-   so that they appear in order of ascending GDB register number.
-   The fault code will be on the stack beyond the last register.  */
-
-#define PUSH_REGISTERS        \
-{ asm ("pushl 8(sp)");        \
-  asm ("pushl 8(sp)");        \
-  asm ("pushal 0x14(sp)");    \
-  asm ("pushr $037777"); }
-
-/* Assuming the registers (including processor status) have been
-   pushed on the stack in order of ascending GDB register number,
-   restore them and return to the address in the saved PC register.  */
-
-#define POP_REGISTERS      \
-{ asm ("popr $037777");    \
-  asm ("subl2 $8,(sp)");   \
-  asm ("movl (sp),sp");    \
-  asm ("rei"); }
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxbsd.h b/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxbsd.h
deleted file mode 100644
index 6defcc6e079..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxbsd.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Definitions to make GDB run on a vax under BSD, 4.3 or 4.4. */
-
-/* This should exist on either 4.3 or 4.4.  4.3 doesn't have limits.h
-   or machine/limits.h.  */
-#include <sys/param.h>
-
-#include "vax/xm-vax.h"
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult.h b/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult.h
deleted file mode 100644
index 576a44fde57..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Definitions to make GDB run on a vax under Ultrix. */
-
-#include "vax/xm-vax.h"
-/* This is required for Ultrix 3.1b, not for later versions.  Ultrix
-   3.1b can't just use xm-vaxult2.h because Ultrix 3.1b does define
-   FD_SET.  Sure, we could have separate configurations for vaxult2,
-   vaxult3, and vaxult, but why bother?  Defining the ptrace constants
-   in infptrace.c isn't going to do any harm; it's not like they are
-   going to change.  */
-#define NO_PTRACE_H
diff --git a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult2.h b/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult2.h
deleted file mode 100644
index a46669830cd..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/vax/xm-vaxult2.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Definitions to make GDB run on a vax under Ultrix. */
-
-#include "vax/xm-vax.h"
-#define NO_PTRACE_H
-
-/* Old versions of ultrix have fd_set but not the FD_* macros.  */
-
-#define FD_SET(bit,fdsetp) ((fdsetp)->fds_bits[(n) / 32] |= (1 << ((n) % 32)))
-#define FD_ZERO(fdsetp) memset (fdsetp, 0, sizeof (*fdsetp))