* config/i386/{i386aix.mh, i386bsd.mh, i386lynx.mh, i386sco.mh,

	i386sco4.mh, i386sol2.mh, i386v.mh, i386v32.mh, i386v4.mh,
	ncr3000.mh, ptx.mh, ptx4.mh}, config/m68k/{altos.mh, apollo68v.mh,
	delta68.mh, dpx2.mh, hp300bsd.mh, hp300hpux.mh, m68klynx.mh,
	m68kv4.mh}, config/m88k/{delta88.mh, delta88v4.mh},
	config/mips/riscos.mh, config/pa/hppahpux.mh,
	config/sparc/{sparclynx.mh, sun4sol2.mh}, config/tahoe/tahoe.mh,
	config/vax/{vaxbsd.mh, vaxult.mh, vaxult2.mh} (REGEX, REGEX1,
	SYSV_DEFINE): No longer define.
	* config/i386/i386sco4.mh (MUNCH_DEFINE): No longer define.

23 files changed, 78 insertions, 86 deletions

diff --git a/gdb/config/i386/i386aix.mh b/gdb/config/i386/i386aix.mh
index 0e7fd75..751f813 100644
--- a/gdb/config/i386/i386aix.mh
+++ b/gdb/config/i386/i386aix.mh
@@ -1,10 +1,12 @@
 # Host: IBM PS/2 (i386) running AIX PS/2
-XDEPFILES= 
+
 XM_FILE= xm-i386aix.h
+XDEPFILES= 
+
 NAT_FILE= nm-i386aix.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386aix-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 TERMCAP=-lcurses
+
 # Use gcc. Only coff output can be debugged
 CC=gcc
diff --git a/gdb/config/i386/i386bsd.mh b/gdb/config/i386/i386bsd.mh
index c918376..2515662 100644
--- a/gdb/config/i386/i386bsd.mh
+++ b/gdb/config/i386/i386bsd.mh
@@ -1,7 +1,7 @@
 # Host: Intel 386 running 386BSD
-XDEPFILES= 
-NATDEPFILES= exec.o fork-child.o infptrace.o inftarg.o corelow.o coredep.o i386b-nat.o
+
 XM_FILE= xm-i386bsd.h
+XDEPFILES= 
+
 NAT_FILE= nm-i386bsd.h
-REGEX=regex.o
-REGEX1=regex.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o coredep.o i386b-nat.o
diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
index 01e9cb3..9cb086f 100644
--- a/gdb/config/i386/i386lynx.mh
+++ b/gdb/config/i386/i386lynx.mh
@@ -1,10 +1,11 @@
 # Host: Intel 386 running LynxOS
+
 XM_FILE= xm-i386lynx.h
 XM_CLIBS= -lbsd
 XDEPFILES= ser-tcp.o
+
 NAT_FILE= nm-i386lynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 GDBSERVER_LIBS= -lbsd
 GDBSERVER_DEPFILES= low-lynx.o
diff --git a/gdb/config/i386/i386v32.mh b/gdb/config/i386/i386v32.mh
index 595aaad..ada9736 100644
--- a/gdb/config/i386/i386v32.mh
+++ b/gdb/config/i386/i386v32.mh
@@ -1,9 +1,9 @@
 # Host: Intel 386 running System V release 3.2
-XDEPFILES= 
+
 XM_FILE= xm-i386v32.h
+XDEPFILES= 
+XM_CLIBS= -lPW
+
 NAT_FILE= nm-i386v.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o i386v-nat.o
-XM_CLIBS= -lPW
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
+
diff --git a/gdb/config/i386/ptx.mh b/gdb/config/i386/ptx.mh
index 20e17d8..256d2fa 100644
--- a/gdb/config/i386/ptx.mh
+++ b/gdb/config/i386/ptx.mh
@@ -1,7 +1,7 @@
-# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387.
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o
+# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
+
 XM_FILE= xm-ptx.h
-NAT_FILE= nm-symmetry.h
+XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o
 XM_CLIBS= -lPW -lseq
-REGEX=regex.o
-REGEX1=regex.o
+
+NAT_FILE= nm-symmetry.h
diff --git a/gdb/config/i386/ptx4.mh b/gdb/config/i386/ptx4.mh
index dd06a9c..3a7c740 100644
--- a/gdb/config/i386/ptx4.mh
+++ b/gdb/config/i386/ptx4.mh
@@ -1,7 +1,7 @@
-# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387.
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o solib.o core-svr4.o
+# Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
+
 XM_FILE= xm-ptx4.h
-NAT_FILE= nm-ptx4.h
+XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o coredep.o solib.o core-svr4.o
 XM_CLIBS= -lseq
-REGEX=regex.o
-REGEX1=regex.o
+
+NAT_FILE= nm-ptx4.h
diff --git a/gdb/config/m68k/altos.mh b/gdb/config/m68k/altos.mh
index 0984539..1073751 100644
--- a/gdb/config/m68k/altos.mh
+++ b/gdb/config/m68k/altos.mh
@@ -1,6 +1,5 @@
 # Host: Altos 3068 (m68k, System V release 2)
-XDEPFILES= infptrace.o inftarg.o fork-child.o altos-xdep.o
+
 XM_FILE= xm-altos.h
-REGEX=regex.o
-REGEX1=regex.o
-SYSV_DEFINE=-DSYSV
+XDEPFILES= infptrace.o inftarg.o fork-child.o altos-xdep.o
+
diff --git a/gdb/config/m68k/apollo68v.mh b/gdb/config/m68k/apollo68v.mh
index f710724..9204f11 100644
--- a/gdb/config/m68k/apollo68v.mh
+++ b/gdb/config/m68k/apollo68v.mh
@@ -1,10 +1,11 @@
-RANLIB=echo >/dev/null
+# Host: Apollo, System V mode (?)
+
 XM_FILE= xm-apollo68v.h
 XM_CLIBS= -lPW
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
-CC= cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_SYS_FILE
 XDEPFILES= 
+
 NAT_FILE= nm-apollo68v.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o a68v-nat.o
+
+RANLIB=echo >/dev/null
+CC= cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_SYS_FILE
diff --git a/gdb/config/m68k/delta68.mh b/gdb/config/m68k/delta68.mh
index 6b00d59..9a657ad 100644
--- a/gdb/config/m68k/delta68.mh
+++ b/gdb/config/m68k/delta68.mh
@@ -1,6 +1,6 @@
 # Motorola Delta Series sysV68 R3V7.1
+
 XM_FILE= xm-delta68.h
-REGEX=regex.o
-REGEX1=regex.o
+
 NAT_FILE= nm-delta68.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o delta68-nat.o
diff --git a/gdb/config/m68k/dpx2.mh b/gdb/config/m68k/dpx2.mh
index feb5e2a..432e9b2 100644
--- a/gdb/config/m68k/dpx2.mh
+++ b/gdb/config/m68k/dpx2.mh
@@ -1,8 +1,9 @@
 # Host: Bull DPX2 (68k, System V release 3)
-XDEPFILES=
+
 XM_FILE= xm-dpx2.h
+XDEPFILES=
+
 NAT_FILE= nm-dpx2.h
 NATDEPFILES= infptrace.o coredep.o corelow.o inftarg.o dpx2-nat.o fork-child.o
-REGEX=regex.o
-REGEX1=regex.o
+
 TERMCAP=-lcurses
diff --git a/gdb/config/m68k/hp300bsd.mh b/gdb/config/m68k/hp300bsd.mh
index fd2fa4b..90b0ff2 100644
--- a/gdb/config/m68k/hp300bsd.mh
+++ b/gdb/config/m68k/hp300bsd.mh
@@ -1,7 +1,7 @@
 # Host: Hewlett-Packard 9000 series 300, running BSD
-XDEPFILES= 
+
 XM_FILE= xm-hp300bsd.h
+XDEPFILES= 
+
 NAT_FILE= nm-hp300bsd.h
-NATDEPFILES= exec.o infptrace.o inftarg.o fork-child.o coredep.o corelow.o
-REGEX=regex.o
-REGEX1=regex.o
+NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o
diff --git a/gdb/config/m68k/hp300hpux.mh b/gdb/config/m68k/hp300hpux.mh
index c0dcf85..9f4ca16 100644
--- a/gdb/config/m68k/hp300hpux.mh
+++ b/gdb/config/m68k/hp300hpux.mh
@@ -1,13 +1,8 @@
 # Host: Hewlett-Packard 9000 series 300, running HPUX
 # The following is true because gcc uses a different .o file format
 # than the native HPUX compiler
-#msg If you compile GDB with GCC on HPUX, you must make sure
-#msg that the `nm' used in `munch' is GNU nm
-#msg
 
 XM_FILE= xm-hp300hpux.h
+
 NAT_FILE= nm-hp300hpux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o hp300ux-nat.o coredep.o corelow.o
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
diff --git a/gdb/config/m68k/m68klynx.mh b/gdb/config/m68k/m68klynx.mh
index ff3089b..48fdf29 100644
--- a/gdb/config/m68k/m68klynx.mh
+++ b/gdb/config/m68k/m68klynx.mh
@@ -1,10 +1,11 @@
 # Host: Motorola 680x0 running LynxOS
+
 XM_FILE= xm-m68klynx.h
 XM_CLIBS= -lbsd
 XDEPFILES= ser-tcp.o
+
 NAT_FILE= nm-m68klynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 GDBSERVER_LIBS= -lbsd
 GDBSERVER_DEPFILES= low-lynx.o
diff --git a/gdb/config/m68k/m68kv4.mh b/gdb/config/m68k/m68kv4.mh
index 2c7a82b..b005906 100644
--- a/gdb/config/m68k/m68kv4.mh
+++ b/gdb/config/m68k/m68kv4.mh
@@ -6,10 +6,6 @@ XDEPFILES=
 NAT_FILE= nm-sysv4.h
 NATDEPFILES= corelow.o core-svr4.o solib.o procfs.o fork-child.o
 
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
-
 # SVR4 comes standard with terminfo, and in some implementations, the
 # old termcap descriptions are incomplete.  So ensure that we use the
 # new terminfo interface and latest terminal descriptions.
diff --git a/gdb/config/m88k/delta88.mh b/gdb/config/m88k/delta88.mh
index b5a0793..2723a94 100644
--- a/gdb/config/m88k/delta88.mh
+++ b/gdb/config/m88k/delta88.mh
@@ -6,6 +6,3 @@ XDEPFILES=
 NAT_FILE= nm-m88k.h
 NATDEPFILES= exec.o infptrace.o inftarg.o fork-child.o m88k-nat.o \
 	corelow.o coredep.o
-
-REGEX=regex.o
-REGEX1=regex.o
diff --git a/gdb/config/m88k/delta88v4.mh b/gdb/config/m88k/delta88v4.mh
index dd7896b..0248023 100644
--- a/gdb/config/m88k/delta88v4.mh
+++ b/gdb/config/m88k/delta88v4.mh
@@ -6,6 +6,3 @@ XDEPFILES=
 NAT_FILE= nm-delta88v4.h
 NATDEPFILES= exec.o fork-child.o m88k-nat.o corelow.o \
 	core-svr4.o procfs.o solib.o
-
-REGEX=regex.o
-REGEX1=regex.o
diff --git a/gdb/config/mips/riscos.mh b/gdb/config/mips/riscos.mh
index e160b33..6a3192f 100644
--- a/gdb/config/mips/riscos.mh
+++ b/gdb/config/mips/riscos.mh
@@ -1,10 +1,12 @@
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o mips-nat.o
-NAT_FILE= nm-riscos.h
+# Host: MIPS running RISC/os
+
 XM_FILE= xm-riscos.h
-REGEX= regex.o
-REGEX1= regex.o
-MUNCH_DEFINE=-B
+
+NAT_FILE= nm-riscos.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o mips-nat.o
+
 MH_CFLAGS=-Wf,-XNh10000
+
 # ptrace(2) apparently has problems in the BSD environment.  No workaround is
 # known except to select the sysv environment.  Could we use /proc instead?
 # These "sysv environments" and "bsd environments" often end up being a pain.
diff --git a/gdb/config/pa/hppahpux.mh b/gdb/config/pa/hppahpux.mh
index 819167e..6cfa8ed 100644
--- a/gdb/config/pa/hppahpux.mh
+++ b/gdb/config/pa/hppahpux.mh
@@ -1,13 +1,15 @@
-# Host: Hewlett-Packard PA-RISC machine, running HPUX 
+# Host: Hewlett-Packard PA-RISC machine, running HPUX
+
 HPREAD=
 # start-sanitize-hpread
 HPREAD=hpread.o
 # end-sanitize-hpread
 TERMCAP = -lcurses
-XDEPFILES= ser-tcp.o
+
 XM_FILE= xm-hppah.h
+XDEPFILES= ser-tcp.o
+
 NAT_FILE= nm-hppah.h
-REGEX=regex.o
-REGEX1=regex.o
-HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
 NATDEPFILES= hppah-nat.o coredep.o corelow.o inftarg.o fork-child.o somread.o infptrace.o $(HPREAD)
+
+HOST_IPC=-DBSD_IPC -DPOSIX_WAIT
diff --git a/gdb/config/sparc/sparclynx.mh b/gdb/config/sparc/sparclynx.mh
index b7bba6e..6fddddd 100644
--- a/gdb/config/sparc/sparclynx.mh
+++ b/gdb/config/sparc/sparclynx.mh
@@ -1,10 +1,11 @@
 # Host: Sparc running LynxOS
+
 XM_FILE= xm-sparclynx.h
-XM_CLIBS= -lbsd
 XDEPFILES= ser-tcp.o
+XM_CLIBS= -lbsd
+
 NAT_FILE= nm-sparclynx.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o
-REGEX=regex.o
-REGEX1=regex.o
+
 GDBSERVER_LIBS= -lbsd
 GDBSERVER_DEPFILES= low-lynx.o
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index 7a7fb93a..1d439e7 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -1,12 +1,11 @@
 # Host: Sun 4 or Sparcstation, running Solaris 2
-XDEPFILES= 
+
 XM_FILE= xm-sun4sol2.h
+XDEPFILES= 
 XM_CLIBS= -lsocket -lnsl
+
 NAT_FILE= nm-sysv4.h
 NATDEPFILES= corelow.o core-sol2.o exec.o solib.o procfs.o fork-child.o
-SYSV_DEFINE=-DSYSV
-REGEX=regex.o
-REGEX1=regex.o
 
 # SVR4 comes standard with terminfo, and in some implementations, the
 # old termcap descriptions are incomplete.  So ensure that we use the
diff --git a/gdb/config/vax/vaxbsd.mh b/gdb/config/vax/vaxbsd.mh
index 87d9476..842422b 100644
--- a/gdb/config/vax/vaxbsd.mh
+++ b/gdb/config/vax/vaxbsd.mh
@@ -1,4 +1,5 @@
 # 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''
@@ -6,8 +7,7 @@
 #msg If this occurs, use gcc
 #msg  (but see comments in Makefile.dist about compiling with gcc).
 
-XDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o
-REGEX=regex.o
-REGEX1=regex.o
 XM_FILE= xm-vaxbsd.h
+XDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o
+
 NAT_FILE= nm-vax.h
diff --git a/gdb/config/vax/vaxult.mh b/gdb/config/vax/vaxult.mh
index 7c2fcca..6d62ac9 100644
--- a/gdb/config/vax/vaxult.mh
+++ b/gdb/config/vax/vaxult.mh
@@ -1,8 +1,7 @@
 # Host: DEC VAX running Ultrix
 
-XDEPFILES= 
-REGEX=regex.o
-REGEX1=regex.o
 XM_FILE= xm-vaxult.h
+XDEPFILES= 
+
 NAT_FILE= nm-vax.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o
diff --git a/gdb/config/vax/vaxult2.mh b/gdb/config/vax/vaxult2.mh
index 532a4fda..bed7ec8 100644
--- a/gdb/config/vax/vaxult2.mh
+++ b/gdb/config/vax/vaxult2.mh
@@ -1,8 +1,7 @@
 # Host: DEC VAX running Ultrix
 
-XDEPFILES= 
-REGEX=regex.o
-REGEX1=regex.o
 XM_FILE= xm-vaxult2.h
+XDEPFILES= 
+
 NAT_FILE= nm-vax.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o