Support i960 vxworks versions > 5.0 with coff, not bout. Default with no

version number is still bout.  Support explicit i960-coff target too.

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 1dd12fdd85fbc0fe7b827ea9a9ad0338f03042c8..a583a03f42ed3340ef71d7cafb8af6a563bf439e 100755 (executable)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -14,6 +14,7 @@ cpu=`echo $canon | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 #  convention, else the table becomes a real mess to understand and maintain.
 
 case "${canon}" in
+  alpha-*-netware*)    bfd_name=alpha-nlm ;;
   alpha-*-*)           bfd_name=alphaosf ;;
   a29k-*-ebmon*)       bfd_name=a29k-coff ;;
   a29k-*-udi*)         bfd_name=a29k-coff ;;
@@ -23,10 +24,11 @@ case "${canon}" in
   h8300*-*-*)          bfd_name=h8300-coff ;;
   h8500-*-*)           bfd_name=h8500-coff ;;
   sh-*-*)              bfd_name=sh-coff ;;
+  hppa*-*-*elf*)       bfd_name=hppa-elf ;;
   hppa*-*-bsd*)                bfd_name=hppabsd ;;
   hppa*-*-hpux*)       bfd_name=hppahpux ;;
   hppa*-*-hiux*)       bfd_name=hppahpux ;;
-  hppa*-*-osf*)                bfd_name=hppa-elf ;;
+  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 ;;
@@ -44,9 +46,13 @@ case "${canon}" in
   i[34]86-*-mach*)     bfd_name=i386-mach3 ;;
   i[34]86-*-osf1mk*)   bfd_name=i386-mach3 ;;
   i[34]86-none-*)      bfd_name=i386-coff ;;
+  i960-*-vxworks4*)    bfd_name=i960-bout ;;
+  i960-*-vxworks5.0)   bfd_name=i960-bout ;;
+  i960-*-vxworks5.*)   bfd_name=i960-coff ;;
   i960-*-vxworks*)     bfd_name=i960-bout ;;
   i960-*-aout*)                bfd_name=i960-bout ;;
   i960-*-bout*)                bfd_name=i960-bout ;;
+  i960-*-coff*)                bfd_name=i960-coff ;;
   i960-*-nindy*)       bfd_name=i960-bout ;;
   m68*-apollo-bsd*)    bfd_name=apollo ;;
   m68*-bull-sysv*)     bfd_name=u68k-coff ;;
@@ -57,14 +63,17 @@ case "${canon}" in
   m68*-*-lynxos*)      bfd_name=m68k-lynx ;;
   m68*-*-os68k*)       bfd_name=m68k-aout ;;
   m68*-*-sunos*)       bfd_name=m68k-aout ;;
-  m68*-*-sysv*)                bfd_name=m68k-coff ;;
   m68*-*-sysv4*)       bfd_name=m68k-elf ;;
+  m68*-*-sysv*)                bfd_name=m68k-coff ;;
   m68*-*-vxworks*)     bfd_name=m68k-aout ;;
   m68*-ericsson-*)     bfd_name=m68k-aout ;;
   m68*-netx-*)         bfd_name=m68k-aout ;;
+
   m88*-*-sysv4*)       bfd_name=m88k-elf ;;
-  m88k-*-*)            bfd_name=m88k-coff ;;
-  m88110-*-*)          bfd_name=m88k-coff ;;
+  # DGUX used to use COFF, but now (Jan 94) I believe it uses ELF by default.
+  m88*-*-dgux*)                bfd_name=m88k-elf ;;
+  m88*-*-*)            bfd_name=m88k-coff ;;
+
   mips*-big-*)         bfd_name=bigmips ;;
   mips*-dec-bsd*)       bfd_name=mipsdecbsd ;;
   mips*-dec-*)         bfd_name=decstation ;;
@@ -101,6 +110,7 @@ case "${canon}" in
   *-*-netware*)                bfd_name=${cpu}-nlm ;;
   *-*-sysv4*)          bfd_name=${cpu}-elf ;;
   *-*-solaris2*)       bfd_name=${cpu}-elf ;;
+  *-*-vsta*)           bfd_name=${cpu}-aout ;;
   *-*-go32*)           bfd_name=${cpu}-aout ;;
   *-*-sysv*)           bfd_name=${cpu}-coff ;;