--- bfd/config.bfd.orig	2016-08-03 07:36:50 UTC
+++ bfd/config.bfd
@@ -187,7 +187,7 @@ case "${targ}" in
     targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
     want64=true
     ;;
-  aarch64-*-freebsd*)
+  aarch64-*-bsdsunix* | aarch64-*-freebsd*)
     targ_defvec=aarch64_elf64_le_vec
     targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
     want64=true
@@ -207,6 +207,11 @@ case "${targ}" in
     targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
     want64=true
     ;;
+  alpha*-*-bsdsunix*)
+    targ_defvec=alpha_elf64_bsdsux_vec
+    targ_selvecs="alpha_elf64_vec alpha_ecoff_le_vec"
+    want64=true
+    ;;
   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
     targ_defvec=alpha_elf64_fbsd_vec
     targ_selvecs="alpha_elf64_vec alpha_ecoff_le_vec"
@@ -246,7 +251,7 @@ case "${targ}" in
     targ_defvec=alpha_ecoff_le_vec
     want64=true
     ;;
-  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
+  ia64*-*-bsdsunix* | ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
     targ_defvec=ia64_elf64_le_vec
     targ_selvecs="ia64_elf64_be_vec ia64_pei_vec"
     want64=true
@@ -261,6 +266,10 @@ case "${targ}" in
     targ_selvecs=alpha_vms_lib_txt_vec
     want64=true
     ;;
+  sparc64-*-bsdsunix*)
+    targ_defvec=sparc_elf64_bsdsux_vec
+    targ_selvecs="sparc_elf64_vec sparc_elf32_vec sparc_aout_sunos_be_vec"
+    ;;
   sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
     targ_defvec=sparc_elf64_fbsd_vec
     targ_selvecs="sparc_elf64_vec sparc_elf32_vec sparc_aout_sunos_be_vec"
@@ -357,7 +366,7 @@ case "${targ}" in
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
     ;;
-  armeb-*-elf | arm*b-*-freebsd* | arm*b-*-linux-* | armeb-*-eabi*)
+  armeb-*-elf | arm*b-*-bsdsunix* | arm*b-*-freebsd* | arm*b-*-linux-* | armeb-*-eabi*)
     targ_defvec=arm_elf32_be_vec
     targ_selvecs=arm_elf32_le_vec
     ;;
@@ -366,7 +375,7 @@ case "${targ}" in
     targ_selvecs=arm_elf32_be_vec
     ;;
   arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
-  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+  arm*-*-bsdsunix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
   arm*-*-eabi* )
     targ_defvec=arm_elf32_le_vec
     targ_selvecs=arm_elf32_be_vec
@@ -613,6 +622,18 @@ case "${targ}" in
     targ_defvec=i386_aout_dynix_vec
     targ_underscore=yes
     ;;
+  i[3-7]86-*-bsdsunixaout*)
+    # has to be before the i[3-7]86-*-bsd* target or everything is screwed!
+    targ_defvec=i386_aout_bsdsux_vec
+    targ_selvecs=i386_aout_bsd_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-bsdsunix*)
+    # has to be before the i[3-7]86-*-bsd* target or everything is screwed!
+    targ_defvec=i386_elf32_bsdsux_vec
+    targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_pei_vec i386_coff_vec"
+    targ64_selvecs="x86_64_elf64_bsdsux_vec x86_64_elf64_vec x86_64_pei_vec l1om_elf64_vec l1om_elf64_bsdsux_vec k1om_elf64_vec k1om_elf64_bsdsux_vec"
+    ;;
   i[3-7]86-*-bsd*)
     targ_defvec=i386_aout_bsd_vec
     targ_underscore=yes
@@ -703,6 +724,11 @@ case "${targ}" in
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
+  x86_64-*-bsdsunix*)
+    targ_defvec=x86_64_elf64_bsdsux_vec
+    targ_selvecs="i386_elf32_bsdsux_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_bsdsux_vec k1om_elf64_vec k1om_elf64_bsdsux_vec"
+    want64=true
+    ;;
   x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
     targ_defvec=x86_64_elf64_fbsd_vec
     targ_selvecs="i386_elf32_fbsd_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
@@ -1044,6 +1070,34 @@ case "${targ}" in
     targ_defvec=mips_elf32_be_vec
     targ_selvecs="mips_elf32_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
+  mips64*el-*-bsdsunix*)
+    # BSDSUniX vectors - has to go here because of the mips*-*-bsd* target will get it otherwise!
+    targ_defvec=mips_elf64_tradbsdsux_le_vec
+    targ_selvecs="mips_elf64_tradbsdsux_le_vec mips_elf32_ntradbsdsux_le_vec mips_elf32_ntradbsdsux_be_vec mips_elf32_tradbsdsux_le_vec mips_elf32_tradbsdsux_be_vec mips_elf64_tradbsdsux_be_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
+    ;;
+  mips64*-*-bsdsunix*)
+    # BSDSUniX vectors - has to go here because of the mips*-*-bsd* target will get it otherwise!
+    targ_defvec=mips_elf64_tradbsdsux_be_vec
+    targ_selvecs="mips_elf64_tradbsdsux_be_vec mips_elf32_ntradbsdsux_be_vec mips_elf32_ntradbsdsux_le_vec mips_elf32_tradbsdsux_be_vec mips_elf32_tradbsdsux_le_vec mips_elf64_tradbsdsux_le_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
+    ;;
+  mips*el-*-bsdsunix*)
+    # BSDSUniX vectors - has to go here because of the mips*-*-bsd* target will get it otherwise!
+    targ_defvec=mips_elf32_tradbsdsux_le_vec
+    targ_selvecs="mips_elf32_tradbsdsux_be_vec mips_elf32_ntradbsdsux_le_vec mips_elf64_tradbsdsux_le_vec mips_elf32_ntradbsdsux_be_vec mips_elf64_tradbsdsux_be_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec"
+    ;;
+  mips*-*-bsdsunix*)
+    # BSDSUniX vectors - has to go here because of the mips*-*-bsd* target will get it otherwise!
+    targ_defvec=mips_elf32_tradbsdsux_be_vec
+    targ_selvecs="mips_elf32_tradbsdsux_le_vec mips_elf32_ntradbsdsux_be_vec mips_elf64_tradbsdsux_be_vec mips_elf32_ntradbsdsux_le_vec mips_elf64_tradbsdsux_le_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec"
+    ;;
 #endif
   mips*-sgi-* | mips*-*-bsd*)
     targ_defvec=mips_ecoff_be_vec
@@ -1118,15 +1172,15 @@ case "${targ}" in
     ;;
   mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=mips_elf32_ntradfbsd_le_vec
-    targ_selvecs="mips_elf32_ntradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec"
+    targ_defvec=mips_elf64_tradfbsd_le_vec
+    targ_selvecs="mips_elf64_tradfbsd_le_vec mips_elf32_ntradfbsd_le_vec mips_elf32_ntradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf64_tradfbsd_be_vec"
     # Generic vectors
     targ_selvecs="${targ_selvecs} mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
     ;;
   mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=mips_elf32_ntradfbsd_be_vec
-    targ_selvecs="mips_elf32_ntradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec"
+    targ_defvec=mips_elf64_tradfbsd_be_vec
+    targ_selvecs="mips_elf64_tradfbsd_be_vec mips_elf32_ntradfbsd_be_vec mips_elf32_ntradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf64_tradfbsd_le_vec"
     # Generic vectors
     targ_selvecs="${targ_selvecs} mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
     ;;
@@ -1278,6 +1332,11 @@ case "${targ}" in
     targ_selvecs=rs6000_xcoff_vec
     want64=true
     ;;
+  powerpc64-*-bsdsunix*)
+    targ_defvec=powerpc_elf64_bsdsux_vec
+    targ_selvecs="powerpc_elf64_vec powerpc_elf32_vec powerpc_elf32_bsdsux_vec powerpc_elf32_le_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
+    want64=true
+    ;;
   powerpc64-*-freebsd*)
     targ_defvec=powerpc_elf64_fbsd_vec
     targ_selvecs="powerpc_elf64_vec powerpc_elf32_vec powerpc_elf32_fbsd_vec powerpc_elf32_le_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
@@ -1296,6 +1355,11 @@ case "${targ}" in
     want64=true
     ;;
 #endif
+  powerpc-*-*bsdsunix*)
+    targ_defvec=powerpc_elf32_bsdsux_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec powerpc_elf64_bsdsux_vec"
+    ;;
   powerpc-*-*freebsd*)
     targ_defvec=powerpc_elf32_fbsd_vec
     targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"