diff -rupN --no-dereference binutils-2.36.1/bfd/config.bfd binutils-2.36.1-new/bfd/config.bfd
--- binutils-2.36.1/bfd/config.bfd	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/config.bfd	2021-02-13 18:13:18.636232921 +0100
@@ -470,7 +470,7 @@ case "${targ}" in
     ;;
 
 #ifdef BFD64
-  bpf-*-none)
+  bpf-*-none | bpf-*)
     targ_defvec=bpf_elf64_le_vec
     targ_selvecs=bpf_elf64_be_vec
     targ_underscore=yes
@@ -1425,7 +1425,7 @@ case "${targ}" in
     ;;
 
   *)
-    echo 1>&2 "*** BFD does not support target ${targ}."
+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
     exit 1
     ;;
diff -rupN --no-dereference binutils-2.36.1/gold/configure binutils-2.36.1-new/gold/configure
--- binutils-2.36.1/gold/configure	2021-01-09 11:59:18.000000000 +0100
+++ binutils-2.36.1-new/gold/configure	2021-02-13 18:13:18.635232926 +0100
@@ -5184,7 +5184,8 @@ for targ in $target $canon_targets; do
     . ${srcdir}/configure.tgt
 
     if test "$targ_obj" = "UNKNOWN"; then
-      as_fn_error $? "\"unsupported target $targ\"" "$LINENO" 5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5
+$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;}
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
       if test "$targ_extra_obj" != ""; then
diff -rupN --no-dereference binutils-2.36.1/gold/configure.ac binutils-2.36.1-new/gold/configure.ac
--- binutils-2.36.1/gold/configure.ac	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/gold/configure.ac	2021-02-13 18:13:18.636232921 +0100
@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do
     . ${srcdir}/configure.tgt
 
     if test "$targ_obj" = "UNKNOWN"; then
-      AC_MSG_ERROR("unsupported target $targ")
+      AC_MSG_WARN("unsupported target $targ")
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
       if test "$targ_extra_obj" != ""; then
diff -rupN --no-dereference binutils-2.36.1/ld/configure.tgt binutils-2.36.1-new/ld/configure.tgt
--- binutils-2.36.1/ld/configure.tgt	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/configure.tgt	2021-02-13 18:13:18.636232921 +0100
@@ -216,7 +216,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
 			targ_extra_emuls="elf32bfin"
 			targ_extra_libpath=$targ_extra_emuls
 			;;
-bpf-*-*)		targ_emul=elf64bpf
+bpf-* | bpf-*-*)	targ_emul=elf64bpf
 			;;
 cr16-*-elf*)		targ_emul=elf32cr16
 			;;
@@ -1026,7 +1026,7 @@ z8k-*-coff)		targ_emul=z8002
 			targ_extra_ofiles=
 			;;
 *)
-  echo 2>&1 "*** ld does not support target ${targ}"
+  echo 2>&1 "*** ld does not support target '${targ}' NO REALLY"
   echo 2>&1 "*** see ld/configure.tgt for supported targets"
   exit 1