From 20e25ea492d64290afb2236806bad90fd0be952e Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Mon, 26 Jun 2006 22:33:42 +0000
Subject: [PATCH] consolidate the sh*netbsd* targets into sh*l* and sh*.

---
 gnu/dist/binutils/bfd/config.bfd |  7 ++-----
 gnu/dist/gdb/bfd/config.bfd      | 16 ++++------------
 gnu/dist/gdb6/bfd/config.bfd     |  7 ++-----
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/gnu/dist/binutils/bfd/config.bfd b/gnu/dist/binutils/bfd/config.bfd
index 6305f1c33dff..97790a7d1ea1 100644
--- a/gnu/dist/binutils/bfd/config.bfd
+++ b/gnu/dist/binutils/bfd/config.bfd
@@ -1132,17 +1132,14 @@ case "${targ}" in
     targ_selvecs="${targ_selvecs} bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
 #endif
     ;;
-  sh-*-netbsdelf*)
+  sh*-*-netbsdelf*)
     targ_defvec=bfd_elf32_shnbsd_vec
     targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
 #ifdef BFD64
     targ_selvecs="${targ_selvecs} bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
 #endif
     ;;
-  sh*-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shnbsd_vec
-    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
-    ;;
+
   sh*-*-symbianelf*)
     targ_defvec=bfd_elf32_shl_symbian_vec
     targ_selvecs="shlcoff_vec shlcoff_small_vec"
diff --git a/gnu/dist/gdb/bfd/config.bfd b/gnu/dist/gdb/bfd/config.bfd
index 7f4501733b64..355487a7d536 100755
--- a/gnu/dist/gdb/bfd/config.bfd
+++ b/gnu/dist/gdb/bfd/config.bfd
@@ -963,27 +963,19 @@ case "${targ}" in
     ;;
 #endif
 
-  shle-*-netbsdelf*)
+  sh*l*-*-netbsdelf*)
     targ_defvec=bfd_elf32_shlnbsd_vec
     targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec"
 #ifdef BFD64
     targ_selvecs="${targ_selvecs} bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
-#endif
-    ;;
-  sh*le-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shlnbsd_vec
-    targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec"
-    ;;
-  sh-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shnbsd_vec
-    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
-#ifdef BFD64
-    targ_selvecs="${targ_selvecs} bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
 #endif
     ;;
   sh*-*-netbsdelf*)
     targ_defvec=bfd_elf32_shnbsd_vec
     targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
+#ifdef BFD64
+    targ_selvecs="${targ_selvecs} bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
+#endif
     ;;
 
   shl*-*-elf* | sh[1234]l*-*-elf* | sh3el*-*-elf*)
diff --git a/gnu/dist/gdb6/bfd/config.bfd b/gnu/dist/gdb6/bfd/config.bfd
index ab47fa3cc252..12a595cfeef4 100644
--- a/gnu/dist/gdb6/bfd/config.bfd
+++ b/gnu/dist/gdb6/bfd/config.bfd
@@ -1154,17 +1154,14 @@ case "${targ}" in
     targ_selvecs="${targ_selvecs} bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
 #endif
     ;;
-  sh-*-netbsdelf*)
+  sh*-*-netbsdelf*)
     targ_defvec=bfd_elf32_shnbsd_vec
     targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
 #ifdef BFD64
     targ_selvecs="${targ_selvecs} bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
 #endif
     ;;
-  sh*-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shnbsd_vec
-    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
-    ;;
+
   sh*-*-symbianelf*)
     targ_defvec=bfd_elf32_shl_symbian_vec
     targ_selvecs="shlcoff_vec shlcoff_small_vec"