* configure.host, config.bfd: Change i[34]86 to i[345]86.

3 files changed, 45 insertions, 41 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9cddfcc..c0dc0f7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,7 @@
 Wed Aug 24 11:49:19 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
+	* configure.host, config.bfd: Change i[34]86 to i[345]86.
+
 	* coffgen.c (coff_real_object_p): Set obj_conv_table_size here,
 	rather than waiting until coff_slurp_symbol_table.
 	(coff_write_alien_symbol): Just ignore BSF_DEBUGGING symbols.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index d68fc00..5153d8e 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -38,26 +38,26 @@ case "${canon}" in
   hppa*-*-hpux*)	bfd_name=hppahpux ;;
   hppa*-*-hiux*)	bfd_name=hppahpux ;;
   hppa*-*-osf*)		bfd_name=hppaosf ;;
-  i[34]86-*-sysv4*)	bfd_name=i386-elf ;;
-  i[34]86-*-unixware)	bfd_name=i386-elf ;;
-  i[34]86-*-solaris2*)	bfd_name=i386-elf ;;
-  i[34]86-*-sysv*)	bfd_name=i386-coff ;;
-  i[34]86-*-isc*)	bfd_name=i386-coff ;;
-  i[34]86-*-sco*)	bfd_name=i386-coff ;;
-  i[34]86-sequent-bsd*)	bfd_name=i386-dynix strip_underscore=yes ;;
-  i[34]86-*-bsd*)	bfd_name=i386-bsd strip_underscore=yes ;;
-  i[34]86-*-coff)	bfd_name=i386-coff ;;
-  i[34]86-*-aix*)	bfd_name=i386-coff ;;
-  i[34]86-*-elf)	bfd_name=i386-elf ;;
-  i[34]86-*-netbsd*)	bfd_name=i386-netbsd strip_underscore=yes ;;
-  i[34]86-*-netware*)	bfd_name=i386-nlm ;;
-  i[34]86-*-linux*)	bfd_name=i386-linux strip_underscore=yes ;;
-  i[34]86-*-lynxos*)	bfd_name=i386-lynx ;;
-  i[34]86-*-gnu*)	bfd_name=i386-mach3 strip_underscore=yes ;;
-  i[34]86-*-mach*)	bfd_name=i386-mach3 strip_underscore=yes ;;
-  i[34]86-*-osf1mk*)	bfd_name=i386-mach3 strip_underscore=yes ;;
-  i[34]86-*-os9k)	bfd_name=i386-os9k ;;
-  i[34]86-none-*)	bfd_name=i386-coff ;;
+  i[345]86-*-sysv4*)	bfd_name=i386-elf ;;
+  i[345]86-*-unixware)	bfd_name=i386-elf ;;
+  i[345]86-*-solaris2*)	bfd_name=i386-elf ;;
+  i[345]86-*-sysv*)	bfd_name=i386-coff ;;
+  i[345]86-*-isc*)	bfd_name=i386-coff ;;
+  i[345]86-*-sco*)	bfd_name=i386-coff ;;
+  i[345]86-sequent-bsd*) bfd_name=i386-dynix strip_underscore=yes ;;
+  i[345]86-*-bsd*)	bfd_name=i386-bsd strip_underscore=yes ;;
+  i[345]86-*-coff)	bfd_name=i386-coff ;;
+  i[345]86-*-aix*)	bfd_name=i386-coff ;;
+  i[345]86-*-elf)	bfd_name=i386-elf ;;
+  i[345]86-*-netbsd*)	bfd_name=i386-netbsd strip_underscore=yes ;;
+  i[345]86-*-netware*)	bfd_name=i386-nlm ;;
+  i[345]86-*-linux*)	bfd_name=i386-linux strip_underscore=yes ;;
+  i[345]86-*-lynxos*)	bfd_name=i386-lynx ;;
+  i[345]86-*-gnu*)	bfd_name=i386-mach3 strip_underscore=yes ;;
+  i[345]86-*-mach*)	bfd_name=i386-mach3 strip_underscore=yes ;;
+  i[345]86-*-osf1mk*)	bfd_name=i386-mach3 strip_underscore=yes ;;
+  i[345]86-*-os9k)	bfd_name=i386-os9k ;;
+  i[345]86-none-*)	bfd_name=i386-coff ;;
   i960-*-vxworks4*)	bfd_name=i960-bout strip_underscore=yes ;;
   i960-*-vxworks5.0)	bfd_name=i960-bout strip_underscore=yes ;;
   i960-*-vxworks5.*)	bfd_name=i960-coff strip_underscore=yes ;;
@@ -81,6 +81,7 @@ case "${canon}" in
   m68*-ericsson-*)	bfd_name=m68k-ose strip_underscore=yes ;;
   m68*-netx-*)		bfd_name=m68k-aout strip_underscore=yes ;;
 
+  m88*-harris-cxux*)	bfd_name=m88k-elf ;;
   # DGUX used to use COFF, but now (Jan 94) I believe it uses ELF by default.
   m88*-*-dgux*)		bfd_name=m88k-elf ;;
   m88*-*-mach3*)	bfd_name=m88k-mach3 ;;
@@ -103,7 +104,7 @@ case "${canon}" in
   mips*el-*-elf*)	bfd_name=mipslelf ;;
   mips*-*-elf*)		bfd_name=mipsbelf ;;
   ns32k-pc532-mach*)	bfd_name=pc532-mach strip_underscore=yes;;
-  ns32k-*-netbsd*)	bfd_name=ns32k-netbsd strip_underscore=yes;;
+  ns32k-*-netbsd*)	bfd_name=ns32k-nbsd strip_underscore=yes;;
   powerpc-*-aix*)	bfd_name=rs6000 ;;
   powerpc-*-elf*)	bfd_name=ppc-elf ;;
   powerpc-*-sysv4*)	bfd_name=ppc-elf ;;
diff --git a/bfd/configure.host b/bfd/configure.host
index 4ff421e..a49c926 100644
--- a/bfd/configure.host
+++ b/bfd/configure.host
@@ -25,25 +25,25 @@ hppa*-*-hiux*)		my_host=hppahpux ;;
 hppa*-*-bsd*)		my_host=hppabsd ;;
 hppa*-*-osf*)		my_host=hppaosf ;;
 
-i[34]86-sequent-bsd*)	my_host=symmetry ;;
-i[34]86-sequent-sysv4*)	my_host=sysv4 ;;
-i[34]86-sequent-sysv*)	my_host=symmetry ;;
-i[34]86-*-bsd*)		my_host=i386bsd ;;
-i[34]86-*-netbsd*)	my_host=i386bsd ;;
-i[34]86-ncr*-sysv4*)	my_host=ncr3000 ;;
-i[34]86-*-go32*)	my_host=go32 ;;
-i[34]86-esix-sysv3*)	my_host=esix ;;
-i[34]86-*-sysv4*)	my_host=i386v4 ;;
-i[34]86-*-sysv*)	my_host=i386v ;;
-i[34]86-*-solaris*)	my_host=i386v ;;
-i[34]86-*-sco*)		my_host=i386sco ;;
-i[34]86-*-mach3*)	my_host=i386mach3 ;;
-i[34]86-*-osf1mk*)	my_host=i386osf1mk ;;
-i[34]86-*-msdos*)	my_host=dose ;;
-i[34]86-*-linux*)	my_host=i386linux ;;
-i[34]86-*-lynxos*)	my_host=i386lynx ;;
-i[34]86-*-isc*)		my_host=i386sco ;;
-i[34]86-*-aix*)		my_host=i386aix ;;
+i[345]86-sequent-bsd*)	my_host=symmetry ;;
+i[345]86-sequent-sysv4*) my_host=sysv4 ;;
+i[345]86-sequent-sysv*)	my_host=symmetry ;;
+i[345]86-*-bsd*)	my_host=i386bsd ;;
+i[345]86-*-netbsd*)	my_host=i386bsd ;;
+i[345]86-ncr*-sysv4*)	my_host=ncr3000 ;;
+i[345]86-*-go32*)	my_host=go32 ;;
+i[345]86-esix-sysv3*)	my_host=esix ;;
+i[345]86-*-sysv4*)	my_host=i386v4 ;;
+i[345]86-*-sysv*)	my_host=i386v ;;
+i[345]86-*-solaris*)	my_host=i386v ;;
+i[345]86-*-sco*)	my_host=i386sco ;;
+i[345]86-*-mach3*)	my_host=i386mach3 ;;
+i[345]86-*-osf1mk*)	my_host=i386osf1mk ;;
+i[345]86-*-msdos*)	my_host=dose ;;
+i[345]86-*-linux*)	my_host=i386linux ;;
+i[345]86-*-lynxos*)	my_host=i386lynx ;;
+i[345]86-*-isc*)	my_host=i386sco ;;
+i[345]86-*-aix*)	my_host=i386aix ;;
 
 i860-*-*)		my_host=stratus ;;
 
@@ -61,10 +61,11 @@ mips-sony-bsd*)		my_host=news-mips ;;
 
 m68*-apollo*-sysv*)	my_host=apollov68 ;;
 m68*-apollo*-bsd*)	my_host=apollo68 ;;
+m68*-atari-sysv4*)	my_host=m68kv4 ;;
 m68*-bull*-sysv*)	my_host=dpx2 ;;
 m68*-convergent-sysv*)	my_host=miniframe ;;
 m68*-cbm-amigados*)	my_host=amigados ;;
-m68*-cbm-sysv4*)	my_host=amix ;;
+m68*-cbm-sysv4*)	my_host=m68kv4 ;;
 m68*-hp-hpux*)		my_host=hp300 ;;
 m68*-hp-bsd*)		my_host=hp300bsd ;;
 m68*-*-lynxos*)		my_host=m68klynx ;;