X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fconfig.bfd;h=40f259c92aa60c89d0b21d0c6c86f4ad8a53200b;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=f9c9f33c7ef47c1145fb575f3b785092db77112e;hpb=211dc24b8744ed14ee5c293e7ac164d02e1fa1fe;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/config.bfd b/bfd/config.bfd
index f9c9f33c7e..40f259c92a 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -1,6 +1,6 @@
 # config.bfd
 #
-#   Copyright (C) 2012-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2012-2020 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,55 +53,6 @@ case $targ in
     echo "*** Use or1k-*-elf or or1k-*-linux as the target instead" >&2
     exit 1
     ;;
- i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu | \
- mips*-*-irix5* | mips*-*-irix6*)
-    # Not obsolete
-    ;;
- arm-epoc-pe* | \
- arm*-*-aout | \
- arm*-*-coff | \
- i[3-7]86-*-sco3.2v5*coff | \
- i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
- i[3-7]86-*-sco3.2v5* | \
- i[3-7]86-*-dgux* | i[3-7]86-*-sysv5* | \
- i[3-7]86-*-chorus* | \
- i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
- i[3-7]86-*-aix* | \
- i[3-7]86-sequent-bsd* | \
- i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
- i[3-7]86-*-freebsd[12] | \
- i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
- i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3] | \
- i[3-7]86-*-linux*aout* | \
- i[3-7]86-*-mach* | i[3-7]86-*-osf1mk* | \
- i[3-7]86-*-os9k | \
- i[3-7]86-none-* | \
- i[3-7]86-*-aout* | i[3-7]86*-*-vsta* | \
- m68*-motorola-sysv* | m68*-hp-bsd* | m68*-*-aout* | \
- m68*-*-coff* | m68*-*-sysv* | \
- m68*-*-hpux* | \
- m68*-*-linux*aout* | \
- m68*-hp*-netbsd* | \
- m68*-*-netbsdaout* | \
- m68*-*-sunos* | m68*-*-os68k* | m68*-*-vxworks* | m68*-netx-* | \
- m68*-*-bsd* | m68*-*-vsta* | \
- m68*-ericsson-* | \
- m68*-*-psos* | \
- mips*-big-* | \
- mips*-dec-* | mips*el-*-ecoff* | \
- mips*-*-ecoff* | \
- mips*-sgi-* | mips*-*-bsd* | \
- mips*-*-lnews* | \
- mips*-*-sysv* | mips*-*-riscos* | \
- powerpc-*-lynxos* | powerpc-*-windiss* | \
- sparclet-*-aout* | \
- sparc86x-*-aout* | \
- sparc*-*-chorus* | \
- sparc-*-linux*aout* | \
- sparc-*-netbsdaout* | \
- sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1] | \
- sparc64-*-aout* | \
- sparc*-*-coff* | \
  null)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $targ is obsolete." >&2
@@ -113,6 +64,10 @@ case $targ in
 esac
 
 case $targ in
+ *-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu | \
+ mips*-*-irix5* | mips*-*-irix6*)
+    # Not obsolete
+    ;;
  *-adobe-* | \
  *-go32-rtems* | \
  *-sony-* | \
@@ -122,22 +77,76 @@ case $targ in
  *-*-rtemsaout* | \
  *-*-rtemscoff* | \
  a29k-* | \
+ arm*-*-aout | \
+ arm-*-coff | \
+ arm-*-netbsd* | \
+ arm-*-openbsd* | \
  arm-*-oabi | \
+ arm-*-riscix* | \
+ arm-epoc-pe* | \
+ c30-*-*aout* | tic30-*-*aout* | \
+ cr16c-*-* | \
  h8300*-*-coff | \
  h8500*-*-coff | \
  hppa*-*-rtems* | \
+ i[3-7]86-*-unixware* | \
+ i[3-7]86-*-dgux* | \
+ i[3-7]86-*-chorus* | \
+ i[3-7]86-*-sysv* | \
+ i[3-7]86-*-isc* | \
+ i[3-7]86-*-sco* | \
+ i[3-7]86-*-coff | \
+ i[3-7]86-*-aix* | \
+ i[3-7]86-sequent-bsd* | \
+ i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12] | \
+ i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
+ i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3] | \
+ i[3-7]86-*-linux*aout* | \
+ i[3-7]86-*-mach* | i[3-7]86-*-osf1mk* | \
+ i[3-7]86-*-os9k | \
+ i[3-7]86-none-* | \
+ i[3-7]86-*-aout* | i[3-7]86*-*-vsta* | \
  i370-* | \
  i860-*-* | \
  i960-*-* | \
+ m68*-*-*bsd* | \
+ m68*-*-aout* | \
+ m68*-*-coff* | \
+ m68*-*-hpux* | \
+ m68*-*-linux*aout* | \
  m68*-*-lynxos* | \
+ m68*-*-os68k* | \
+ m68*-*-psos* | \
+ m68*-*-sunos* | \
+ m68*-*-sysv* | \
+ m68*-*-vsta* | \
+ m68*-*-vxworks* | \
  m68*-apollo-* | \
  m68*-apple-aux* | \
  m68*-bull-sysv* | \
+ m68*-ericsson-* | \
+ m68*-motorola-sysv* | \
+ m68*-netx-* | \
  m88*-*-* | \
  maxq-*-coff | \
+ mips*-*-bsd* | \
+ mips*-*-ecoff* | \
+ mips*-*-lnews* | \
+ mips*-*-mach3* | \
+ mips*-*-pe* | \
+ mips*-*-riscos* | \
+ mips*-*-sysv* | \
+ mips*-big-* | \
+ mips*-dec-* | \
+ mips*-sgi-* | \
  mips*el-*-rtems* | \
+ powerpc-*-lynxos* | powerpc-*-windiss* | \
  sh*-*-symbianelf* | sh5*-*-* | sh64*-*-* | \
+ sparc*-*-*aout* | \
+ sparc*-*-chorus* | \
+ sparc*-*-coff* | \
  sparc-*-lynxos* | \
+ sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1] | \
  tahoe-*-* | \
  vax-*-bsd* | vax-*-ultrix* | vax-*-vms* | \
  w65-*-* | \
@@ -163,6 +172,7 @@ c54x*)		 targ_archs=bfd_tic54x_arch ;;
 cr16*)		 targ_archs=bfd_cr16_arch ;;
 crisv32)	 targ_archs=bfd_cris_arch ;;
 crx*)		 targ_archs=bfd_crx_arch ;;
+csky*)		 targ_archs=bfd_csky_arch ;;
 dlx*)		 targ_archs=bfd_dlx_arch ;;
 fido*)		 targ_archs=bfd_m68k_arch ;;
 hppa*)		 targ_archs=bfd_hppa_arch ;;
@@ -172,9 +182,11 @@ lm32)	         targ_archs=bfd_lm32_arch ;;
 m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;;
 m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch bfd_m9s12x_arch bfd_m9s12xg_arch" ;;
 m68*)		 targ_archs=bfd_m68k_arch ;;
+s12z*)         targ_archs=bfd_s12z_arch ;;
 microblaze*)	 targ_archs=bfd_microblaze_arch ;;
 mips*)		 targ_archs=bfd_mips_arch ;;
 nds32*)		 targ_archs=bfd_nds32_arch ;;
+nfp)		 targ_archs=bfd_nfp_arch ;;
 nios2*)          targ_archs=bfd_nios2_arch ;;
 or1k*|or1knd*)	 targ_archs=bfd_or1k_arch ;;
 pdp11*)		 targ_archs=bfd_pdp11_arch ;;
@@ -195,7 +207,7 @@ wasm32)		 targ_archs=bfd_wasm32_arch ;;
 x86_64*)	 targ_archs=bfd_i386_arch ;;
 xtensa*)	 targ_archs=bfd_xtensa_arch ;;
 xgate)		 targ_archs=bfd_xgate_arch ;;
-z80|r800)	 targ_archs=bfd_z80_arch ;;
+z80*|r800|z180|gbz80|ez80*)	 targ_archs=bfd_z80_arch ;;
 z8k*)		 targ_archs=bfd_z8k_arch ;;
 *)		 targ_archs=bfd_${targ_cpu}_arch ;;
 esac
@@ -205,31 +217,8 @@ esac
 #  Make sure that the left side always has two dashes.  Otherwise you
 #  can get spurious matches.  Even for unambiguous cases, do this as a
 #  convention, else the table becomes a real mess to understand and maintain.
-#
-#  Keep obsolete entries above the START comment, to keep them out of
-#  targmatch.h.
 
 case "${targ}" in
-  mips*-dec-bsd*)
-    echo "This target is obsolete and has been removed."
-    exit 1
-    ;;
-
-  mips*-*-mach3*)
-    echo "This target is obsolete and has been removed."
-    exit 1
-    ;;
-
-  mips*-*-pe*)
-    echo "This target is obsolete and has been removed."
-    exit 1
-    ;;
-
-  plugin)
-    targ_defvec=plugin_vec
-    targ_selvecs="plugin_vec"
-    ;;
-
 # START OF targmatch.h
 #ifdef BFD64
   aarch64-*-darwin*)
@@ -322,15 +311,6 @@ case "${targ}" in
     targ_selvecs=alpha_vms_lib_txt_vec
     want64=true
     ;;
-  sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
-    targ_defvec=sparc_elf64_fbsd_vec
-    targ_selvecs="sparc_elf64_vec sparc_elf32_vec sparc_aout_sunos_be_vec"
-    ;;
-  sparc64-*-netbsd* | sparc64-*-openbsd*)
-    targ_defvec=sparc_elf64_vec
-    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
-    want64=true
-    ;;
 #endif /* BFD64 */
 
   am33_2.0-*-linux*)
@@ -370,31 +350,17 @@ case "${targ}" in
     ;;
   armeb-*-netbsdelf*)
     targ_defvec=arm_elf32_be_vec
-    targ_selvecs="arm_elf32_le_vec arm_aout_nbsd_vec"
+    targ_selvecs="arm_elf32_le_vec"
     ;;
   arm-*-netbsdelf*)
     targ_defvec=arm_elf32_le_vec
-    targ_selvecs="arm_elf32_be_vec arm_aout_nbsd_vec"
-    ;;
-  arm-*-netbsd* | arm-*-openbsd*)
-    targ_defvec=arm_aout_nbsd_vec
-    targ_selvecs="arm_elf32_le_vec arm_elf32_be_vec"
-    targ_underscore=yes
+    targ_selvecs="arm_elf32_be_vec"
     ;;
   arm-*-nto* | nto*arm*)
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
     targ_cflags=-D__QNXTARGET__
     ;;
-  arm-*-riscix*)
-    targ_defvec=arm_aout_riscix_vec
-    ;;
-  arm-epoc-pe*)
-    targ_defvec=arm_pe_epoc_le_vec
-    targ_selvecs="arm_pe_epoc_le_vec arm_pe_epoc_be_vec arm_pei_epoc_le_vec arm_pei_epoc_be_vec"
-    targ_underscore=no
-    targ_cflags=-DARM_COFF_BUGFIX
-    ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
     targ_defvec=arm_pe_wince_le_vec
     targ_selvecs="arm_pe_wince_le_vec arm_pe_wince_be_vec arm_pei_wince_le_vec arm_pei_wince_be_vec"
@@ -406,19 +372,6 @@ case "${targ}" in
     targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
     targ_underscore=yes
     ;;
-  arm-*-aout | armel-*-aout)
-    targ_defvec=arm_aout_le_vec
-    targ_selvecs=arm_aout_be_vec
-    ;;
-  armeb-*-aout)
-    targ_defvec=arm_aout_be_vec
-    targ_selvecs=arm_aout_le_vec
-    ;;
-  arm-*-coff)
-    targ_defvec=arm_coff_le_vec
-    targ_selvecs=arm_coff_be_vec
-    targ_underscore=yes
-    ;;
   arm-*-phoenix*)
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
@@ -433,9 +386,9 @@ case "${targ}" in
     ;;
   arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-  arm*-*-eabi* | arm-*-rtems*)
+  arm*-*-eabi* | arm-*-rtems* | arm*-*-uclinuxfdpiceabi)
     targ_defvec=arm_elf32_le_vec
-    targ_selvecs=arm_elf32_be_vec
+    targ_selvecs="arm_elf32_fdpic_le_vec arm_elf32_be_vec arm_elf32_fdpic_be_vec"
     ;;
   arm*-*-vxworks | arm*-*-windiss)
     targ_defvec=arm_elf32_vxworks_le_vec
@@ -484,11 +437,6 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
-  cr16c-*-elf*)
-    targ_defvec=cr16c_elf32_vec
-    targ_underscore=yes
-    ;;
-
 #ifdef BFD64
   cris-*-* | crisv32-*-*)
     targ_defvec=cris_aout_vec
@@ -506,6 +454,11 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
+  csky-*-elf* | csky-*-linux* )
+    targ_defvec=csky_elf32_le_vec
+    targ_selvecs="csky_elf32_be_vec csky_elf32_le_vec"
+    ;;
+
   d10v-*-*)
     targ_defvec=d10v_elf32_vec
     ;;
@@ -519,6 +472,14 @@ case "${targ}" in
     targ_defvec=d30v_elf32_vec
     ;;
 
+#ifdef BFD64
+  bpf-*-none)
+    targ_defvec=bpf_elf64_le_vec
+    targ_selvecs=bpf_elf64_be_vec
+    targ_underscore=yes
+    ;;
+#endif
+
   epiphany-*-*)
     targ_defvec=epiphany_elf32_vec
     targ_underscore=yes
@@ -526,7 +487,6 @@ case "${targ}" in
 
   fido-*-elf* )
     targ_defvec=m68k_elf32_vec
-    targ_selvecs="m68k_coff_vec"
     ;;
 
   fr30-*-elf)
@@ -600,13 +560,7 @@ case "${targ}" in
     targ_selvecs=hppa_elf32_vec
     ;;
 
-  i[3-7]86-*-sco3.2v5*coff)
-    targ_defvec=i386_coff_vec
-    targ_selvecs=i386_elf32_vec
-    ;;
-  i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
-  i[3-7]86-*-elf* | i[3-7]86-*-sco3.2v5* | \
-  i[3-7]86-*-dgux* | i[3-7]86-*-sysv5* | i[3-7]86-*-rtems*)
+  i[3-7]86-*-elf* | i[3-7]86-*-rtems*)
     targ_defvec=i386_elf32_vec
     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
     ;;
@@ -623,10 +577,6 @@ case "${targ}" in
     want64=true
     ;;
 #endif
-  i[3-7]86-*-kaos*)
-    targ_defvec=i386_elf32_vec
-    targ_selvecs=i386_elf32_vec
-    ;;
   i[3-7]86-*-nto*)
     targ_defvec=i386_elf32_vec
     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
@@ -635,10 +585,6 @@ case "${targ}" in
     targ_defvec=i386_elf32_vec
     targ_selvecs=iamcu_elf32_vec
     ;;
-  i[3-7]86-*-chorus*)
-    targ_defvec=i386_elf32_vec
-    targ_selvecs=iamcu_elf32_vec
-    ;;
   i[3-7]86-*-dicos*)
     targ_defvec=i386_elf32_vec
     targ_selvecs=iamcu_elf32_vec
@@ -648,20 +594,12 @@ case "${targ}" in
     targ_defvec=i386_coff_go32_vec
     targ_selvecs="i386_coff_go32stubbed_vec i386_aout_vec"
     ;;
-  i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
-  i[3-7]86-*-aix*)
-    targ_defvec=i386_coff_vec
-    ;;
   i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
     targ_defvec=i386_mach_o_vec
     targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
     targ64_selvecs=x86_64_mach_o_vec
     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
     ;;
-  i[3-7]86-sequent-bsd*)
-    targ_defvec=i386_aout_dynix_vec
-    targ_underscore=yes
-    ;;
   i[3-7]86-*-bsd*)
     targ_defvec=i386_aout_bsd_vec
     targ_underscore=yes
@@ -671,12 +609,6 @@ case "${targ}" in
     targ_selvecs=iamcu_elf32_vec
     targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
-  i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
-  i[3-7]86-*-freebsd[12])
-    targ_defvec=i386_aout_fbsd_vec
-    targ_selvecs=i386_aout_bsd_vec
-    targ_underscore=yes
-    ;;
   i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
     targ_defvec=i386_elf32_fbsd_vec
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_pei_vec i386_coff_vec"
@@ -689,31 +621,20 @@ case "${targ}" in
     ;;
   i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu)
     targ_defvec=i386_elf32_vec
-    targ_selvecs="i386_aout_nbsd_vec iamcu_elf32_vec"
+    targ_selvecs="iamcu_elf32_vec"
     targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   i[3-7]86-*-netbsdpe*)
     targ_defvec=i386_pe_vec
     targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
     ;;
-  i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
-  i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3])
-    targ_defvec=i386_aout_nbsd_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_bsd_vec"
-    targ_underscore=yes
-    ;;
   i[3-7]86-*-openbsd*)
     targ_defvec=i386_elf32_vec
-    targ_selvecs="iamcu_elf32_vec i386_aout_nbsd_vec"
-    ;;
-  i[3-7]86-*-linux*aout*)
-    targ_defvec=i386_aout_linux_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec"
-    targ_underscore=yes
+    targ_selvecs="iamcu_elf32_vec"
     ;;
   i[3-7]86-*-linux-*)
     targ_defvec=i386_elf32_vec
-    targ_selvecs="iamcu_elf32_vec i386_aout_linux_vec i386_pei_vec"
+    targ_selvecs="iamcu_elf32_vec i386_pei_vec"
     targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   i[3-7]86-*-nacl*)
@@ -746,6 +667,10 @@ case "${targ}" in
   x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia)
     targ_defvec=x86_64_elf64_vec
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec l1om_elf64_vec k1om_elf64_vec"
+    case "${targ}" in
+      x86_64-*-rtems*)
+    targ_selvecs="${targ_selvecs} x86_64_pei_vec"
+    esac
     want64=true
     ;;
   x86_64-*-dragonfly*)
@@ -760,12 +685,12 @@ case "${targ}" in
     ;;
   x86_64-*-netbsd* | x86_64-*-openbsd*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-linux-*)
     targ_defvec=x86_64_elf64_vec
-    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_aout_linux_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-nacl*)
@@ -776,7 +701,7 @@ case "${targ}" in
     ;;
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin)
     targ_defvec=x86_64_pe_vec
-    targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_be_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
+    targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
     want64=true
     targ_underscore=no
     ;;
@@ -798,14 +723,6 @@ case "${targ}" in
     targ_defvec=i386_elf32_vec
     targ_selvecs=iamcu_elf32_vec
     ;;
-  i[3-7]86-*-mach* | i[3-7]86-*-osf1mk*)
-    targ_defvec=i386_aout_mach3_vec
-    targ_cflags=-DSTAT_FOR_EXEC
-    targ_underscore=yes
-    ;;
-  i[3-7]86-*-os9k)
-    targ_defvec=i386_aout_os9k_vec
-    ;;
   i[3-7]86-*-msdos*)
     targ_defvec=i386_aout_vec
     targ_selvecs=i386_msdos_vec
@@ -834,23 +751,13 @@ case "${targ}" in
     ;;
   i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
     targ_defvec=i386_pe_vec
-    targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
+    targ_selvecs="i386_pe_vec i386_pe_big_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
     targ_underscore=yes
     ;;
-  i[3-7]86-none-*)
-    targ_defvec=i386_coff_vec
-    ;;
-  i[3-7]86-*-aout* | i[3-7]86*-*-vsta*)
-    targ_defvec=i386_aout_vec
-    ;;
   i[3-7]86-*-vxworks*)
     targ_defvec=i386_elf32_vxworks_vec
     targ_underscore=yes
     ;;
-  i[3-7]86-*-chaos)
-    targ_defvec=i386_elf32_vec
-    targ_selfvecs="iamcu_elf32_vec i386chaos_vec"
-    ;;
 
   ia16-*-elf)
     targ_defvec=i386_elf32_vec
@@ -906,85 +813,13 @@ case "${targ}" in
     targ_selvecs="m68hc11_elf32_vec m68hc12_elf32_vec"
     ;;
 
-  m68*-motorola-sysv*)
-    targ_defvec=m68k_coff_sysv_vec
-    ;;
-  m68*-hp-bsd*)
-    targ_defvec=m68k_aout_hp300bsd_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-aout*)
-    targ_defvec=aout0_be_vec
-    # We include core_cisco_be_vec here, rather than making a separate cisco
-    # configuration, so that cisco-core.c gets routinely tested at
-    # least for compilation.
-    targ_selvecs="core_cisco_be_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-elf* | m68*-*-sysv4* | m68*-*-rtems* | m68*-*-uclinux*)
-    targ_defvec=m68k_elf32_vec
-    targ_selvecs="m68k_coff_vec"
-    ;;
-  m68*-*-coff* | m68*-*-sysv*)
-    targ_defvec=m68k_coff_vec
-    targ_selvecs="m68k_coff_vec m68k_versados_vec"
-    ;;
-  m68*-*-hpux*)
-    targ_defvec=m68k_aout_hp300hpux_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-linux*aout*)
-    targ_defvec=m68k_aout_linux_vec
-    targ_selvecs=m68k_elf32_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-linux-*)
-    targ_defvec=m68k_elf32_vec
-    targ_selvecs=m68k_aout_linux_vec
-    ;;
-  m68*-*-gnu*)
-    targ_defvec=m68k_elf32_vec
-    # targ_selvecs=m68kmach3_vec
-    # targ_cflags=-DSTAT_FOR_EXEC
-    ;;
-  m68*-hp*-netbsd*)
-    targ_defvec=m68k_aout_4knbsd_vec
-    targ_selvecs="m68k_aout_nbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-netbsdelf*)
-    targ_defvec=m68k_elf32_vec
-    targ_selvecs="m68k_aout_nbsd_vec m68k_aout_4knbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
-    ;;
-  m68*-*-netbsdaout* | m68*-*-netbsd*)
-    targ_defvec=m68k_aout_nbsd_vec
-    targ_selvecs="m68k_aout_4knbsd_vec m68k_elf32_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-openbsd*)
-    targ_defvec=m68k_aout_nbsd_vec
-    targ_selvecs="m68k_aout_4knbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-sunos* | m68*-*-os68k* | m68*-*-vxworks* | m68*-netx-* | \
-  m68*-*-bsd* | m68*-*-vsta*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_underscore=yes
-    ;;
-  m68*-ericsson-*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_selvecs="m68k_coff_vec m68k_versados_vec tekhex_vec"
-    targ_underscore=yes
-    ;;
-  m68*-cbm-*)
-    targ_defvec=m68k_elf32_vec
-    targ_selvecs=m68k_coff_vec
-    ;;
-  m68*-*-psos*)
+  m68*-*-*)
     targ_defvec=m68k_elf32_vec
-    targ_underscore=yes
     ;;
 
+  s12z-*-*)
+    targ_defvec=s12z_elf32_vec
+    ;;
   mcore-*-elf)
     targ_defvec=mcore_elf32_be_vec
     targ_selvecs="mcore_elf32_be_vec mcore_elf32_le_vec"
@@ -1014,10 +849,6 @@ case "${targ}" in
     targ_selvecs=microblaze_elf32_le_vec
     ;;
 
-  mips*-big-*)
-    targ_defvec=mips_ecoff_be_vec
-    targ_selvecs=mips_ecoff_le_vec
-    ;;
 #ifdef BFD64
   mips*el-*-netbsd*)
     targ_defvec=mips_elf32_trad_le_vec
@@ -1027,16 +858,6 @@ case "${targ}" in
     targ_defvec=mips_elf32_trad_be_vec
     targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
-#endif
-  mips*-dec-* | mips*el-*-ecoff*)
-    targ_defvec=mips_ecoff_le_vec
-    targ_selvecs=mips_ecoff_be_vec
-    ;;
-  mips*-*-ecoff*)
-    targ_defvec=mips_ecoff_be_vec
-    targ_selvecs=mips_ecoff_le_vec
-    ;;
-#ifdef BFD64
   mips*-*-irix6*)
     targ_defvec=mips_elf32_n_be_vec
     targ_selvecs="mips_elf32_n_le_vec mips_elf32_be_vec mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
@@ -1053,26 +874,6 @@ case "${targ}" in
     targ_defvec=mips_elf32_be_vec
     targ_selvecs="mips_elf32_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
-#endif
-  mips*-sgi-* | mips*-*-bsd*)
-    targ_defvec=mips_ecoff_be_vec
-    targ_selvecs=mips_ecoff_le_vec
-    ;;
-  mips*-*-lnews*)
-    targ_defvec=mips_ecoff_bele_vec
-    targ_selvecs="mips_ecoff_le_vec mips_ecoff_be_vec"
-    ;;
-#ifdef BFD64
-  mips*-*-sysv4*)
-    targ_defvec=mips_elf32_trad_be_vec
-    targ_selvecs="mips_elf32_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
-    ;;
-#endif
-  mips*-*-sysv* | mips*-*-riscos*)
-    targ_defvec=mips_ecoff_be_vec
-    targ_selvecs=mips_ecoff_le_vec
-    ;;
-#ifdef BFD64
   mips*el-*-vxworks*)
     targ_defvec=mips_elf32_vxworks_le_vec
     targ_selvecs="mips_elf32_le_vec mips_elf32_vxworks_be_vec mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
@@ -1198,6 +999,12 @@ case "${targ}" in
     targ_selvecs=nds32_elf32_le_vec
     ;;
 
+#ifdef BFD64
+  nfp-*-*)
+    targ_defvec=nfp_elf64_vec
+    ;;
+#endif
+
   ns32k-pc532-mach* | ns32k-pc532-ux*)
     targ_defvec=ns32k_aout_pc532mach_vec
     targ_underscore=yes
@@ -1251,7 +1058,7 @@ case "${targ}" in
     want64=true
     ;;
 #ifdef BFD64
-  powerpc64-*-aix5.[01] | rs6000-*-aix5.[01])
+  powerpc64-*-aix5.[01])
     targ_defvec=rs6000_xcoff64_aix_vec
     targ_selvecs="rs6000_xcoff_vec"
     want64=true
@@ -1264,7 +1071,7 @@ case "${targ}" in
     want64=true
     ;;
 #ifdef BFD64
-  powerpc64-*-aix[5-9]* | rs6000-*-aix[5-9]*)
+  powerpc64-*-aix[5-9]*)
     targ_cflags=-DAIX_WEAK_SUPPORT
     targ_defvec=rs6000_xcoff64_aix_vec
     targ_selvecs="rs6000_xcoff_vec"
@@ -1365,12 +1172,12 @@ case "${targ}" in
     ;;
 
 #ifdef BFD64
-  riscv32-*-*)
+  riscv-*-* | riscv32*-*-*)
     targ_defvec=riscv_elf32_vec
     targ_selvecs="riscv_elf32_vec riscv_elf64_vec"
     want64=true
     ;;
-  riscv64-*-*)
+  riscv64*-*-*)
     targ_defvec=riscv_elf64_vec
     targ_selvecs="riscv_elf32_vec riscv_elf64_vec"
     want64=true
@@ -1387,6 +1194,10 @@ case "${targ}" in
     targ_selvecs="rx_elf32_be_vec rx_elf32_le_vec rx_elf32_be_ns_vec"
     targ_underscore=yes
     ;;
+  rx-*-linux*)
+    targ_defvec=rx_elf32_linux_le_vec
+    targ_selvecs="rx_elf32_linux_le_vec"
+    ;;
 
   s390-*-linux*)
     targ_defvec=s390_elf32_vec
@@ -1476,96 +1287,35 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
-  sparclet-*-aout*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_selvecs=sparc_aout_le_vec
-    targ_underscore=yes
-    ;;
-  sparc86x-*-aout*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_underscore=yes
-    ;;
-  sparclite-*-elf* | sparc86x-*-elf*)
-    targ_defvec=sparc_elf32_vec
-    ;;
-  sparc*-*-chorus*)
-    targ_defvec=sparc_elf32_vec
-    ;;
-  sparc-*-linux*aout*)
-    targ_defvec=sparc_aout_linux_vec
-    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
-    targ_underscore=yes
-    ;;
-  sparc-*-linux-* | sparcv*-*-linux-*)
-    targ_defvec=sparc_elf32_vec
-    targ_selvecs="sparc_aout_linux_vec sparc_elf64_vec sparc_aout_sunos_be_vec"
-    ;;
-  sparc-*-netbsdelf*)
-    targ_defvec=sparc_elf32_vec
-    targ_selvecs=sparc_aout_nbsd_vec
-    ;;
-  sparc-*-netbsdaout* | sparc-*-netbsd*)
-    targ_defvec=sparc_aout_nbsd_vec
-    targ_selvecs=sparc_elf32_vec
-    targ_underscore=yes
-    ;;
-  sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1])
-    targ_defvec=sparc_aout_nbsd_vec
-    targ_underscore=yes
-    ;;
-  sparc-*-openbsd*)
-    targ_defvec=sparc_elf32_vec
-    targ_selvecs=sparc_aout_nbsd_vec
-    ;;
-  sparc-*-elf*)
-    targ_defvec=sparc_elf32_vec
-    targ_selvecs=sparc_aout_sunos_be_vec
-    ;;
   sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
     targ_defvec=sparc_elf32_sol2_vec
-    targ_selvecs=sparc_aout_sunos_be_vec
     ;;
 #ifdef BFD64
   sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
     targ_defvec=sparc_elf32_sol2_vec
-    targ_selvecs="sparc_elf64_sol2_vec sparc_aout_sunos_be_vec"
-    want64=true
-    ;;
-#endif
-  sparc-*-sysv4*)
-    targ_defvec=sparc_elf32_vec
-    ;;
-  sparc-*-vxworks*)
-    targ_defvec=sparc_elf32_vxworks_vec
-    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
-    ;;
-#ifdef BFD64
-  sparc64-*-aout*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_underscore=yes
+    targ_selvecs="sparc_elf64_sol2_vec"
     want64=true
     ;;
-  sparc64*-*-linux-*)
-    targ_defvec=sparc_elf64_vec
-    targ_selvecs="sparc_elf32_vec sparc_aout_linux_vec sparc_aout_sunos_be_vec"
-    want64=true
+  sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
+    targ_defvec=sparc_elf64_fbsd_vec
+    targ_selvecs="sparc_elf64_vec sparc_elf32_vec"
     ;;
-  sparc64-*-elf* | sparc64-*-rtems* )
+  sparc64*-*-*)
     targ_defvec=sparc_elf64_vec
-    targ_selvecs=sparc_elf32_vec
+    targ_selvecs="sparc_elf32_vec"
     want64=true
     ;;
-#endif /* BFD64 */
-  sparc*-*-coff*)
-    targ_defvec=sparc_coff_vec
-    ;;
-  sparc-*-rtems*)
+#endif
+  sparc-*-linux-* | sparcv*-*-linux-*)
     targ_defvec=sparc_elf32_vec
-    targ_selvecs="sparc_aout_sunos_be_vec sparc_coff_vec"
+    targ_selvecs="sparc_elf64_vec"
+    ;;
+  sparc-*-vxworks*)
+    targ_defvec=sparc_elf32_vxworks_vec
+    targ_selvecs="sparc_elf32_vec"
     ;;
   sparc*-*-*)
-    targ_defvec=sparc_aout_sunos_be_vec
-    targ_underscore=yes
+    targ_defvec=sparc_elf32_vec
     ;;
 
   spu-*-elf)
@@ -1583,11 +1333,6 @@ case "${targ}" in
     targ_selvecs="tic6x_elf32_linux_be_vec tic6x_elf32_le_vec tic6x_elf32_be_vec"
     ;;
 
-  tic80*-*-*)
-    targ_defvec=tic80_coff_vec
-    targ_underscore=yes
-    ;;
-
 #ifdef BFD64
   tilegx-*-*)
     targ_defvec=tilegx_elf64_le_vec
@@ -1659,17 +1404,28 @@ case "${targ}" in
     targ_defvec=xc16x_elf32_vec
     ;;
 
-  z80-*-*)
+  z80-*-coff)
     targ_defvec=z80_coff_vec
     targ_underscore=no
     ;;
 
+  z80-*-elf)
+    targ_defvec=z80_elf32_vec
+    targ_underscore=no
+    ;;
+
   z8k*-*-*)
     targ_defvec=z8k_coff_vec
     targ_underscore=yes
     ;;
 
 # END OF targmatch.h
+  bpf-*-*)
+    echo "*** Configuration $targ is not fully supported." >&2
+    echo "*** Use bpf or bpf-*-none as the target instead." >&2
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "*** BFD does not support target ${targ}."
     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."