Move pending-obsolesence targets onto the obsolete list.

	* config.bfd: Move pending obsoletion targets to obsolete list.
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6fea91a..d22d38d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Move pending obsoletion targets to obsolete list.
+
 2021-07-16  Giulio Benetti  <giulio.benetti@benettiengineering.com>
 
 	* elf32-or1k.c (or1k_elf_relocate_section): Use a separate entry
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 30087e3..c4cabf7 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -48,12 +48,7 @@
 
 # Catch obsolete configurations.
 case $targ in
- openrisc-*-* | or32-*-*)
-    echo "*** Configuration $targ is obsolete." >&2
-    echo "*** Use or1k-*-elf or or1k-*-linux as the target instead" >&2
-    exit 1
-    ;;
- *-*-netbsdpe* | null)
+ null)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration $targ is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -73,6 +68,7 @@
  *-sony-* | \
  *-tandem-* | \
  *-*-ieee* | \
+ *-*-netbsdpe* | \
  *-*-netware* | \
  *-*-rtemsaout* | \
  *-*-rtemscoff* | \
@@ -141,6 +137,8 @@
  mips*-dec-* | \
  mips*-sgi-* | \
  mips*el-*-rtems* | \
+ openrisc-*-* | \
+ or32-*-* | \
  powerpc-*-lynxos* | powerpc-*-windiss* | \
  powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin* | \
  sh*-*-symbianelf* | sh5*-*-* | sh64*-*-* | \