From 99a147107dd06e180a2d7ceac2117b2d9756ab97 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 9 Jul 2004 12:32:35 +0000 Subject: Rename sh-symbian-elf toolchain to sh-*-symbianelf --- bfd/ChangeLog | 10 ++++++++++ bfd/config.bfd | 2 +- bfd/elf32-sh-symbian.c | 2 ++ bfd/elf32-sh.c | 4 ---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d7c94574d37..d7bbfe1c9c6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2004-07-09 Nick Clifton + + * config.bfd: Change sh-sybmian-elf to sh-*-symbianelf. + * elf32-sh-symbian.c: Rename the sh_find_elf_flags and + sh_elf_get_flags_from_mach functions so that they do not conflict + when this target is built with other sh-elf targets. + * elf32-sh.c (sh_elf_get_flags_from_mach): Remove bogus + suppression of this function. + (sh_elf_find_flags): Likewise. + 2004-07-07 Tomer Levi * Makefile.am (ALL_MACHINES): Add cpu-crx.lo. diff --git a/bfd/config.bfd b/bfd/config.bfd index bc4c78c9a00..c8c08ed4b9d 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -1107,7 +1107,7 @@ case "${targ}" in targ_defvec=bfd_elf32_shnbsd_vec targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec" ;; - sh*-symbian-elf*) + sh*-*-symbianelf*) targ_defvec=bfd_elf32_shl_symbian_vec targ_selvecs="shlcoff_vec shlcoff_small_vec" targ_underscore=yes diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c index 0dbf2277377..6c243399b27 100644 --- a/bfd/elf32-sh-symbian.c +++ b/bfd/elf32-sh-symbian.c @@ -21,6 +21,8 @@ /* Stop elf32-sh.c from defining any target vectors. */ #define SH_TARGET_ALREADY_DEFINED +#define sh_find_elf_flags sh_symbian_find_elf_flags +#define sh_elf_get_flags_from_mach sh_symbian_elf_get_flags_from_mach #include "elf32-sh.c" diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index b5a3caf39ed..e989bd5a857 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -6833,7 +6833,6 @@ sh_elf_set_mach_from_flags (bfd *abfd) return the equivalent ELF flags from the table. Return -1 if no match is found. */ -#ifndef SH_TARGET_ALREADY_DEFINED int sh_elf_get_flags_from_mach (unsigned long mach) { @@ -6848,7 +6847,6 @@ sh_elf_get_flags_from_mach (unsigned long mach) return -1; } -#endif #endif /* not sh_elf_set_mach_from_flags */ #ifndef sh_elf_set_private_flags @@ -6885,7 +6883,6 @@ sh_elf_copy_private_data (bfd * ibfd, bfd * obfd) /* This function returns the ELF architecture number that corresponds to the given arch_sh* flags. */ -#ifndef SH_TARGET_ALREADY_DEFINED int sh_find_elf_flags (unsigned int arch_set) { @@ -6894,7 +6891,6 @@ sh_find_elf_flags (unsigned int arch_set) return sh_elf_get_flags_from_mach (bfd_mach); } -#endif /* This routine initialises the elf flags when required and calls sh_merge_bfd_arch() to check dsp/fpu compatibility. */ -- cgit v1.2.1