diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/cpu-sh.c | 29 | ||||
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/emulparams/shelf32.sh | 2 |
4 files changed, 19 insertions, 22 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d79145b..e5edc36 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 17 19:23:43 2002 J"orn Rennecke <joern.rennecke@superh.com> + + * cpu-sh.c (scan_mach): Delete. + (arch_info_struct): Replace scan_mach with bfd_default_scan. + (bfd_sh_arch): Likewise. + 2002-04-16 Nick Clifton <nickc@cambridge.redhat.com> * ihex.c (ihex_write_object_contents): Fix check for records diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c index 30cd141..dff2f88 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 }; diff --git a/ld/ChangeLog b/ld/ChangeLog index e0cf40f..9ec7c8e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +Wed Apr 17 19:23:14 2002 J"orn Rennecke <joern.rennecke@superh.com> + + * emulparams/shelf32.sh (MACHINE): Now sh5. + 2002-04-17 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> * ldgram.y: Fix syntax warning. diff --git a/ld/emulparams/shelf32.sh b/ld/emulparams/shelf32.sh index 9b0c698..c05da3f 100644 --- a/ld/emulparams/shelf32.sh +++ b/ld/emulparams/shelf32.sh @@ -6,7 +6,7 @@ TEXT_START_ADDR=0x1000 STACK_ADDR='ALIGN (0x40000) + 0x40000' MAXPAGESIZE=128 ARCH=sh -MACHINE= +MACHINE=sh5 ALIGNMENT=8 TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes |