From 9e8bf29afd779c353af4b8e10e20d5f6b82ce49f Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Sat, 1 Feb 1992 12:46:55 +0000
Subject: [PATCH] * xm-vax.h, xm-vaxult.h, xm-vaxbsd.h, config/mh-vaxult,
 config/mh-vaxbsd, configure.in:  Split up config stuff for Vaxen into BSD and
 Ultrix.

---
 gdb/config/vaxbsd.mh | 12 ++++++++++++
 gdb/config/vaxult.mh |  6 ++++++
 gdb/configure.in     | 11 ++++++++++-
 gdb/xm-vax.h         |  9 +--------
 gdb/xm-vaxbsd.h      |  7 +++++++
 gdb/xm-vaxult.h      |  3 +++
 6 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 gdb/config/vaxbsd.mh
 create mode 100644 gdb/config/vaxult.mh
 create mode 100644 gdb/xm-vaxbsd.h
 create mode 100644 gdb/xm-vaxult.h

diff --git a/gdb/config/vaxbsd.mh b/gdb/config/vaxbsd.mh
new file mode 100644
index 00000000000..832ab76869a
--- /dev/null
+++ b/gdb/config/vaxbsd.mh
@@ -0,0 +1,12 @@
+# 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).
+
+XDEPFILES= infptrace.o coredep.o
+REGEX=regex.o
+REGEX1=regex.o
+XM_FILE= xm-vaxbsd.h
diff --git a/gdb/config/vaxult.mh b/gdb/config/vaxult.mh
new file mode 100644
index 00000000000..fa075ced06e
--- /dev/null
+++ b/gdb/config/vaxult.mh
@@ -0,0 +1,6 @@
+# Host: DEC VAX running Ultrix
+
+XDEPFILES= infptrace.o coredep.o
+REGEX=regex.o
+REGEX1=regex.o
+XM_FILE= xm-vaxult.h
diff --git a/gdb/configure.in b/gdb/configure.in
index 2e9813e6322..e906434e347 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -129,7 +129,16 @@ m88k)
 	esac
 	;;
 
-arm | vax | merlin | none | np1 | pn | pyramid | tahoe)
+vax)
+	case "${host_os}" in
+	bsd*)
+		gdb_host=vaxbsd ;;
+	ultrix*)
+		gdb_host=vaxult ;;
+	esac
+	;;
+
+arm | merlin | none | np1 | pn | pyramid | tahoe)
 	gdb_host=${host_cpu}
 	;;
 
diff --git a/gdb/xm-vax.h b/gdb/xm-vax.h
index ceb59ab2f09..778602aedbc 100644
--- a/gdb/xm-vax.h
+++ b/gdb/xm-vax.h
@@ -1,4 +1,4 @@
-/* Definitions to make GDB run on a vax under 4.2bsd.
+/* Common definitions to make GDB run on Vaxen under 4.2bsd and Ultrix.
    Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -17,13 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifndef ultrix /* FIXME */
-/* We have to include these files now, so that GDB will not make
-   competing definitions in defs.h.  */
-#include <machine/endian.h>
-#include <machine/limits.h>
-#endif /* ultrix */
-
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
 /* Get rid of any system-imposed stack limit if possible.  */
diff --git a/gdb/xm-vaxbsd.h b/gdb/xm-vaxbsd.h
new file mode 100644
index 00000000000..c072d99aa51
--- /dev/null
+++ b/gdb/xm-vaxbsd.h
@@ -0,0 +1,7 @@
+/* Definitions to make GDB run on a vax under 4.2bsd.
+
+/* We have to include these files now, so that GDB will not make
+   competing definitions in defs.h.  */
+#include <machine/endian.h>
+#include <machine/limits.h>
+#include "xm-vax.h"
diff --git a/gdb/xm-vaxult.h b/gdb/xm-vaxult.h
new file mode 100644
index 00000000000..3a7e986a9e9
--- /dev/null
+++ b/gdb/xm-vaxult.h
@@ -0,0 +1,3 @@
+/* Definitions to make GDB run on a vax under Ultrix.
+
+#include "xm-vax.h"
-- 
2.30.2