* configure.in: Change i[34]86 to i[345]86.

	* nlm/configure.in: Likewise.
	* gdbserver/configure.in: Likewise.

4 files changed, 120 insertions, 114 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 043867168d0..544cbe89905 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 24 13:08:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in: Change i[34]86 to i[345]86.
+	* nlm/configure.in: Likewise.
+	* gdbserver/configure.in: Likewise.
+
 Wed Aug 24 09:41:09 1994  J.T. Conklin  (jtc@cygnus.com)
 
 	* configure.in (i386-*-netware): Automatically configure nlm
diff --git a/gdb/configure.in b/gdb/configure.in
index fc7c5b57c1b..5e5e2ec3521 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -17,7 +17,7 @@ case "${host_cpu}" in
 
 c[12])			gdb_host_cpu=convex ;;
 hppa*)			gdb_host_cpu=pa ;;
-i[34]86)		gdb_host_cpu=i386 ;;
+i[345]86)		gdb_host_cpu=i386 ;;
 m68*)			gdb_host_cpu=m68k ;;
 m88*)			gdb_host_cpu=m88k ;;
 np1)			gdb_host_cpu=gould ;;
@@ -43,30 +43,30 @@ hppa*-*-hiux*)		gdb_host=hppahpux ;;
 hppa*-*-hpux*)		gdb_host=hppahpux ;;
 hppa*-*-osf*)		gdb_host=hppabsd ;;
 
-i[34]86-ncr-*)		gdb_host=ncr3000 ;;
-i[34]86-sequent-bsd*)	gdb_host=symmetry ;;  # dynix
-i[34]86-sequent-sysv4*)	gdb_host=ptx4 ;;
-i[34]86-sequent-sysv*)	gdb_host=ptx ;;
-i[34]86-*-aix*)		gdb_host=i386aix ;;
-i[34]86-*-bsd*)		gdb_host=i386bsd ;;
-i[34]86-*-netbsd*)	gdb_host=i386bsd ;;
-i[34]86-*-go32*)	gdb_host=go32 ;;
-i[34]86-*-linux*)	gdb_host=linux ;;
-i[34]86-*-lynxos*)	gdb_host=i386lynx ;;
-i[34]86-*-mach3*)	gdb_host=i386m3 ;;
-i[34]86-*-mach*)	gdb_host=i386mach ;;
-i[34]86-*-osf1mk*)	gdb_host=osf1mk ;;
-i[34]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
-i[34]86-*-sco*)		gdb_host=i386sco ;;
-i[34]86-*-solaris*)	gdb_host=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_host=sun386 ;;
-i[34]86-*-sysv3.2*)	gdb_host=i386v32 ;;
-i[34]86-*-sysv32*)	gdb_host=i386v32 ;;
-i[34]86-*-sysv4*)	gdb_host=i386v4 ;;
-i[34]86-*-unixware)	gdb_host=i386v4 ;;
-i[34]86-*-sysv*)	gdb_host=i386v ;;
-i[34]86-*-isc*)		gdb_host=i386v32 ;;
-i[34]86-*-os9k)		gdb_host=i386os9k ;;
+i[345]86-ncr-*)		gdb_host=ncr3000 ;;
+i[345]86-sequent-bsd*)	gdb_host=symmetry ;;  # dynix
+i[345]86-sequent-sysv4*) gdb_host=ptx4 ;;
+i[345]86-sequent-sysv*)	gdb_host=ptx ;;
+i[345]86-*-aix*)	gdb_host=i386aix ;;
+i[345]86-*-bsd*)	gdb_host=i386bsd ;;
+i[345]86-*-netbsd*)	gdb_host=i386bsd ;;
+i[345]86-*-go32*)	gdb_host=go32 ;;
+i[345]86-*-linux*)	gdb_host=linux ;;
+i[345]86-*-lynxos*)	gdb_host=i386lynx ;;
+i[345]86-*-mach3*)	gdb_host=i386m3 ;;
+i[345]86-*-mach*)	gdb_host=i386mach ;;
+i[345]86-*-osf1mk*)	gdb_host=osf1mk ;;
+i[345]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
+i[345]86-*-sco*)	gdb_host=i386sco ;;
+i[345]86-*-solaris*)	gdb_host=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_host=sun386 ;;
+i[345]86-*-sysv3.2*)	gdb_host=i386v32 ;;
+i[345]86-*-sysv32*)	gdb_host=i386v32 ;;
+i[345]86-*-sysv4*)	gdb_host=i386v4 ;;
+i[345]86-*-unixware)	gdb_host=i386v4 ;;
+i[345]86-*-sysv*)	gdb_host=i386v ;;
+i[345]86-*-isc*)	gdb_host=i386v32 ;;
+i[345]86-*-os9k)	gdb_host=i386os9k ;;
 
 m680[01]0-sun-sunos3*)	gdb_host=sun2os3 ;;
 m680[01]0-sun-sunos4*)	gdb_host=sun2os4 ;;
@@ -155,7 +155,7 @@ case "${target_cpu}" in
 alpha)			gdb_target_cpu=alpha ;;
 c[12])			gdb_target_cpu=convex ;;
 hppa*)			gdb_target_cpu=pa ;;
-i[34]86)		gdb_target_cpu=i386 ;;
+i[345]86)		gdb_target_cpu=i386 ;;
 m68*)			gdb_target_cpu=m68k ;;
 m88*)			gdb_target_cpu=m88k ;;
 mips*)			gdb_target_cpu=mips ;;
@@ -201,32 +201,32 @@ hppa*-*-hpux*)		gdb_target=hppahpux ;;
 hppa*-*-hiux*)		gdb_target=hppahpux ;;
 hppa*-*-osf*)		gdb_target=hppaosf ;;
 
-i[34]86-sequent-bsd*)	gdb_target=symmetry ;;
-i[34]86-sequent-sysv4*)	gdb_target=ptx4 ;;
-i[34]86-sequent-sysv*)	gdb_target=ptx ;;
-i[34]86-ncr-*)		gdb_target=ncr3000 ;;
-i[34]86-*-aout*)	gdb_target=i386aout ;;
-i[34]86-*-coff*)	gdb_target=i386v ;;
-i[34]86-*-elf*)		gdb_target=i386v ;;
-i[34]86-*-aix*)		gdb_target=i386aix ;;
-i[34]86-*-bsd*)		gdb_target=i386bsd ;;
-i[34]86-*-netbsd*)	gdb_target=i386bsd ;;
-i[34]86-*-os9k)		gdb_target=i386os9k ;;
-i[34]86-*-go32*)	gdb_target=i386aout ;;
-i[34]86-*-lynxos*)	gdb_target=i386lynx
+i[345]86-sequent-bsd*)	gdb_target=symmetry ;;
+i[345]86-sequent-sysv4*) gdb_target=ptx4 ;;
+i[345]86-sequent-sysv*)	gdb_target=ptx ;;
+i[345]86-ncr-*)		gdb_target=ncr3000 ;;
+i[345]86-*-aout*)	gdb_target=i386aout ;;
+i[345]86-*-coff*)	gdb_target=i386v ;;
+i[345]86-*-elf*)	gdb_target=i386v ;;
+i[345]86-*-aix*)	gdb_target=i386aix ;;
+i[345]86-*-bsd*)	gdb_target=i386bsd ;;
+i[345]86-*-netbsd*)	gdb_target=i386bsd ;;
+i[345]86-*-os9k)	gdb_target=i386os9k ;;
+i[345]86-*-go32*)	gdb_target=i386aout ;;
+i[345]86-*-lynxos*)	gdb_target=i386lynx
 			configdirs="${configdirs} gdbserver" ;;
-i[34]86-*-solaris*)	gdb_target=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_target=sun386 ;;
-i[34]86-*-sysv4*)	gdb_target=i386v4 ;;
-i[34]86-*-sco*)		gdb_target=i386v ;;
-i[34]86-*-sysv*)	gdb_target=i386v ;;
-i[34]86-*-linux*)	gdb_target=linux ;;
-i[34]86-*-isc*)		gdb_target=i386v ;;
-i[34]86-*-mach3*)	gdb_target=i386m3 ;;
-i[34]86-*-mach*)	gdb_target=i386mach ;;
-i[34]86-*-netware*)	gdb_target=i386nw
+i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_target=sun386 ;;
+i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
+i[345]86-*-sco*)	gdb_target=i386v ;;
+i[345]86-*-sysv*)	gdb_target=i386v ;;
+i[345]86-*-linux*)	gdb_target=linux ;;
+i[345]86-*-isc*)	gdb_target=i386v ;;
+i[345]86-*-mach3*)	gdb_target=i386m3 ;;
+i[345]86-*-mach*)	gdb_target=i386mach ;;
+i[345]86-*-netware*)	gdb_target=i386nw
 			configdirs="${configdirs} nlm" ;;
-i[34]86-*-osf1mk*)	gdb_target=i386mk ;;
+i[345]86-*-osf1mk*)	gdb_target=i386mk ;;
 
 i960-*-bout*)		gdb_target=vxworks960 ;;
 i960-*-coff*)		gdb_target=nindy960 ;;
diff --git a/gdb/gdbserver/configure.in b/gdb/gdbserver/configure.in
index c9aee22adeb..1e06a05d4f2 100644
--- a/gdb/gdbserver/configure.in
+++ b/gdb/gdbserver/configure.in
@@ -20,7 +20,7 @@ case "${host_cpu}" in
 
 c[12])			gdb_host_cpu=convex ;;
 hppa*)			gdb_host_cpu=pa ;;
-i[34]86)		gdb_host_cpu=i386 ;;
+i[345]86)		gdb_host_cpu=i386 ;;
 m68*)			gdb_host_cpu=m68k ;;
 np1)			gdb_host_cpu=gould ;;
 pyramid)		gdb_host_cpu=pyr ;;
@@ -41,23 +41,23 @@ c[12]-*-*)		gdb_host=convex ;;
 hppa*-hp-bsd*)		gdb_host=hppabsd ;;
 hppa*-hp-hpux*)		gdb_host=hppahpux ;;
 
-i[34]86-ncr-*)		gdb_host=ncr3000 ;;
-i[34]86-sequent-*)	gdb_host=symmetry ;;
+i[345]86-ncr-*)		gdb_host=ncr3000 ;;
+i[345]86-sequent-*)	gdb_host=symmetry ;;
 
-i[34]86-*-bsd*)		gdb_host=i386bsd ;;
-i[34]86-*-lynxos*)	gdb_host=i386lynx ;;
-i[34]86-*-go32)		gdb_host=go32
+i[345]86-*-bsd*)	gdb_host=i386bsd ;;
+i[345]86-*-lynxos*)	gdb_host=i386lynx ;;
+i[345]86-*-go32)	gdb_host=go32
 			gdb_serial_driver=ser-go32.c
 			;;
-i[34]86-*-linux)	gdb_host=linux ;;
-i[34]86-*-mach)		gdb_host=i386mach ;;
-i[34]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
-i[34]86-*-sco*)		gdb_host=i386sco ;;
-i[34]86-*-solaris*)	gdb_host=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_host=sun386 ;;
-i[34]86-*-sysv3.2)	gdb_host=i386v32 ;;
-i[34]86-*-sysv4*)	gdb_host=i386v4 ;;
-i[34]86-*-sysv*)	gdb_host=i386v ;;
+i[345]86-*-linux)	gdb_host=linux ;;
+i[345]86-*-mach)	gdb_host=i386mach ;;
+i[345]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
+i[345]86-*-sco*)	gdb_host=i386sco ;;
+i[345]86-*-solaris*)	gdb_host=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_host=sun386 ;;
+i[345]86-*-sysv3.2)	gdb_host=i386v32 ;;
+i[345]86-*-sysv4*)	gdb_host=i386v4 ;;
+i[345]86-*-sysv*)	gdb_host=i386v ;;
 
 m680[01]0-sun-sunos3*)	gdb_host=sun2os3 ;;
 m680[01]0-sun-sunos4*)	gdb_host=sun2os4 ;;
@@ -131,7 +131,7 @@ case "${target_cpu}" in
 
 c[12])			gdb_target_cpu=convex ;;
 hppa*)			gdb_target_cpu=pa ;;
-i[34]86)		gdb_target_cpu=i386 ;;
+i[345]86)		gdb_target_cpu=i386 ;;
 m68*)			gdb_target_cpu=m68k ;;
 np1)			gdb_target_cpu=gould ;;
 pn)			gdb_target_cpu=gould ;;
@@ -167,22 +167,22 @@ sh-*-*)			gdb_target=sh ;;
 hppa*-*-bsd*)		gdb_target=hppabsd ;;
 hppa*-*-hpux*)		gdb_target=hppahpux ;;
 
-i[34]86-sequent-*)	gdb_target=symmetry ;;
-i[34]86-ncr-*)		gdb_target=ncr3000 ;;
-
-i[34]86-*-aout)		gdb_target=i386aout ;;
-i[34]86-*-coff)		gdb_target=i386v ;;
-i[34]86-*-elf)		gdb_target=i386v ;;
-
-i[34]86-*-bsd*)		gdb_target=i386bsd ;;
-i[34]86-*-lynxos*)	gdb_target=i386lynx ;;
-i[34]86-*-go32)		gdb_target=i386aout ;;
-i[34]86-*-solaris*)	gdb_target=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_target=sun386 ;;
-i[34]86-*-sysv4*)	gdb_target=i386v4 ;;
-i[34]86-*-sco*)		gdb_target=i386v ;;
-i[34]86-*-sysv*)	gdb_target=i386v ;;
-i[34]86-*-linux)	gdb_target=linux ;;
+i[345]86-sequent-*)	gdb_target=symmetry ;;
+i[345]86-ncr-*)		gdb_target=ncr3000 ;;
+
+i[345]86-*-aout)	gdb_target=i386aout ;;
+i[345]86-*-coff)	gdb_target=i386v ;;
+i[345]86-*-elf)		gdb_target=i386v ;;
+
+i[345]86-*-bsd*)	gdb_target=i386bsd ;;
+i[345]86-*-lynxos*)	gdb_target=i386lynx ;;
+i[345]86-*-go32)	gdb_target=i386aout ;;
+i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_target=sun386 ;;
+i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
+i[345]86-*-sco*)	gdb_target=i386v ;;
+i[345]86-*-sysv*)	gdb_target=i386v ;;
+i[345]86-*-linux)	gdb_target=linux ;;
 
 i960-*-bout)		gdb_target=vxworks960 ;;
 i960-*-coff)		gdb_target=nindy960 ;;
diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in
index 2e0ff17ad3a..6eb6f9d2050 100644
--- a/gdb/nlm/configure.in
+++ b/gdb/nlm/configure.in
@@ -11,7 +11,7 @@ case "${host_cpu}" in
 alpha)			gdb_host_cpu=alpha ;;
 c[12])			gdb_host_cpu=convex ;;
 hppa*)			gdb_host_cpu=pa ;;
-i[34]86)		gdb_host_cpu=i386 ;;
+i[345]86)		gdb_host_cpu=i386 ;;
 m68*)			gdb_host_cpu=m68k ;;
 np1)			gdb_host_cpu=gould ;;
 pyramid)		gdb_host_cpu=pyr ;;
@@ -33,23 +33,23 @@ c[12]-*-*)		gdb_host=convex ;;
 hppa*-hp-bsd*)		gdb_host=hppabsd ;;
 hppa*-hp-hpux*)		gdb_host=hppahpux ;;
 
-i[34]86-ncr-*)		gdb_host=ncr3000 ;;
-i[34]86-sequent-*)	gdb_host=symmetry ;;
+i[345]86-ncr-*)		gdb_host=ncr3000 ;;
+i[345]86-sequent-*)	gdb_host=symmetry ;;
 
-i[34]86-*-bsd*)		gdb_host=i386bsd ;;
-i[34]86-*-lynxos*)	gdb_host=i386lynx ;;
-i[34]86-*-go32)		gdb_host=go32
+i[345]86-*-bsd*)	gdb_host=i386bsd ;;
+i[345]86-*-lynxos*)	gdb_host=i386lynx ;;
+i[345]86-*-go32)	gdb_host=go32
 			gdb_serial_driver=ser-go32.c
 			;;
-i[34]86-*-linux)	gdb_host=linux ;;
-i[34]86-*-mach)		gdb_host=i386mach ;;
-i[34]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
-i[34]86-*-sco*)		gdb_host=i386sco ;;
-i[34]86-*-solaris*)	gdb_host=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_host=sun386 ;;
-i[34]86-*-sysv3.2)	gdb_host=i386v32 ;;
-i[34]86-*-sysv4*)	gdb_host=i386v4 ;;
-i[34]86-*-sysv*)	gdb_host=i386v ;;
+i[345]86-*-linux)	gdb_host=linux ;;
+i[345]86-*-mach)	gdb_host=i386mach ;;
+i[345]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
+i[345]86-*-sco*)	gdb_host=i386sco ;;
+i[345]86-*-solaris*)	gdb_host=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_host=sun386 ;;
+i[345]86-*-sysv3.2)	gdb_host=i386v32 ;;
+i[345]86-*-sysv4*)	gdb_host=i386v4 ;;
+i[345]86-*-sysv*)	gdb_host=i386v ;;
 
 m680[01]0-sun-sunos3*)	gdb_host=sun2os3 ;;
 m680[01]0-sun-sunos4*)	gdb_host=sun2os4 ;;
@@ -116,7 +116,7 @@ case "${target_cpu}" in
 alpha)			gdb_target_cpu=alpha ;;
 c[12])			gdb_target_cpu=convex ;;
 hppa*)			gdb_target_cpu=pa ;;
-i[34]86)		gdb_target_cpu=i386 ;;
+i[345]86)		gdb_target_cpu=i386 ;;
 m68*)			gdb_target_cpu=m68k ;;
 np1)			gdb_target_cpu=gould ;;
 pn)			gdb_target_cpu=gould ;;
@@ -153,22 +153,22 @@ sh-*-*)			gdb_target=sh ;;
 hppa*-*-bsd*)		gdb_target=hppabsd ;;
 hppa*-*-hpux*)		gdb_target=hppahpux ;;
 
-i[34]86-sequent-*)	gdb_target=symmetry ;;
-i[34]86-ncr-*)		gdb_target=ncr3000 ;;
-
-i[34]86-*-aout)		gdb_target=i386aout ;;
-i[34]86-*-coff)		gdb_target=i386v ;;
-i[34]86-*-elf)		gdb_target=i386v ;;
-
-i[34]86-*-bsd*)		gdb_target=i386bsd ;;
-i[34]86-*-lynxos*)	gdb_target=i386lynx ;;
-i[34]86-*-go32)		gdb_target=i386aout ;;
-i[34]86-*-solaris*)	gdb_target=i386sol2 ;;
-i[34]86-*-sunos*)	gdb_target=sun386 ;;
-i[34]86-*-sysv4*)	gdb_target=i386v4 ;;
-i[34]86-*-sco*)		gdb_target=i386v ;;
-i[34]86-*-sysv*)	gdb_target=i386v ;;
-i[34]86-*-linux)	gdb_target=linux ;;
+i[345]86-sequent-*)	gdb_target=symmetry ;;
+i[345]86-ncr-*)		gdb_target=ncr3000 ;;
+
+i[345]86-*-aout)	gdb_target=i386aout ;;
+i[345]86-*-coff)	gdb_target=i386v ;;
+i[345]86-*-elf)		gdb_target=i386v ;;
+
+i[345]86-*-bsd*)	gdb_target=i386bsd ;;
+i[345]86-*-lynxos*)	gdb_target=i386lynx ;;
+i[345]86-*-go32)	gdb_target=i386aout ;;
+i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_target=sun386 ;;
+i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
+i[345]86-*-sco*)	gdb_target=i386v ;;
+i[345]86-*-sysv*)	gdb_target=i386v ;;
+i[345]86-*-linux)	gdb_target=linux ;;
 
 i960-*-bout)		gdb_target=vxworks960 ;;
 i960-*-coff)		gdb_target=nindy960 ;;