From ac4ff2fd7a036fb0277d2cff4dc603d5eff96503 Mon Sep 17 00:00:00 2001
From: Joern Rennecke <joern.rennecke@arc.com>
Date: Wed, 17 Apr 2002 19:31:50 +0000
Subject: Re-enable linking for sh5: ld: 	* emulparams/shelf32.sh
 (MACHINE): Now sh5. bfd: 	* cpu-sh.c (scan_mach): Delete. 
 (arch_info_struct): Replace scan_mach with bfd_default_scan. 	(bfd_sh_arch):
 Likewise.

---
 bfd/cpu-sh.c | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'bfd/cpu-sh.c')

diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
index 30cd141ea9c..dff2f88ebe1 100644
--- a/bfd/cpu-sh.c
+++ b/bfd/cpu-sh.c
@@ -23,19 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean scan_mach
-  PARAMS ((const struct bfd_arch_info *, const char *));
-
-static boolean
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcasecmp (info->printable_name, string) == 0)
-    return true;
-  return false;
-}
-
 #if 0
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
@@ -75,7 +62,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH2_NEXT
   },
   {
@@ -89,7 +76,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH_DSP_NEXT
   },
   {
@@ -103,7 +90,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH3_NEXT
   },
   {
@@ -117,7 +104,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH3_DSP_NEXT
   },
   {
@@ -131,7 +118,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH3E_NEXT
   },
   {
@@ -145,7 +132,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH4_NEXT
   },
   {
@@ -159,7 +146,7 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,			/* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH64_NEXT
   },
 };
@@ -176,6 +163,6 @@ const bfd_arch_info_type bfd_sh_arch =
   1,
   true,				/* the default machine */
   bfd_default_compatible,
-  scan_mach,
+  bfd_default_scan,
   SH_NEXT
 };
-- 
cgit v1.2.1