diff options
| -rw-r--r-- | bfd/ChangeLog | 10 | ||||
| -rw-r--r-- | bfd/config.bfd | 2 | ||||
| -rw-r--r-- | bfd/elf32-sh-symbian.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-sh.c | 4 | ||||
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/NEWS | 2 | ||||
| -rw-r--r-- | gas/config/tc-sh.c | 4 | ||||
| -rwxr-xr-x | gas/configure | 2 | ||||
| -rw-r--r-- | gas/configure.in | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/NEWS | 2 | ||||
| -rw-r--r-- | ld/configure.tgt | 2 |
12 files changed, 34 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d7c9457..d7bbfe1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2004-07-09 Nick Clifton <nickc@redhat.com> + + * 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 <Tomer.Levi@nsc.com> * Makefile.am (ALL_MACHINES): Add cpu-crx.lo. diff --git a/bfd/config.bfd b/bfd/config.bfd index bc4c78c..c8c08ed 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 0dbf227..6c24339 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 b5a3caf..e989bd5 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. */ diff --git a/gas/ChangeLog b/gas/ChangeLog index 03532ee..feab2ee 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2004-07-09 Nick Clifton <nickc@redhat.com> + + * configure.in: Change sh-sybmian-elf to sh-*-symbianelf. + * configure: Regenerate. + * NEWS: Change sh-sybmian-elf to sh-*-symbianelf. + * config/tc-sh.c (sh_elf_final_processing): Use renamed version of + sh_find_elf_flags if necessary. + 2004-07-08 Richard Sandiford <rsandifo@redhat.com> * config/tc-mips.c (mips_fix_adjustable): If the full addend is @@ -2,7 +2,7 @@ * Support for the crx-elf target added. -* Support for the sh-symbian-elf target added. +* Support for the sh-symbianelf target added. * Added a pseudo-op (.secrel32) to generate 32 bit section relative relocations on pe[i]-i386; required for this target's DWARF 2 support. diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c index f33925b..1962151 100644 --- a/gas/config/tc-sh.c +++ b/gas/config/tc-sh.c @@ -3629,6 +3629,10 @@ sh_elf_final_processing (void) if (sh64_isa_mode != sh64_isa_unspecified) val = EF_SH5; else +#elif defined TARGET_SYMBIAN + if (1) + val = sh_symbian_find_elf_flags (valid_arch); + else #endif /* HAVE_SH64 */ val = sh_find_elf_flags (valid_arch); diff --git a/gas/configure b/gas/configure index f2c87b9..e8242be 100755 --- a/gas/configure +++ b/gas/configure @@ -4507,7 +4507,7 @@ echo "$as_me: error: Solaris must be configured little endian" >&2;} sh5*-*-netbsd*) fmt=elf em=nbsd ;; sh64*-*-netbsd*) fmt=elf em=nbsd ;; sh*-*-netbsdelf*) fmt=elf em=nbsd ;; - sh*-symbian-elf*) fmt=elf endian=little + sh*-*-symbianelf*) fmt=elf endian=little cat >>confdefs.h <<\_ACEOF #define TARGET_SYMBIAN 1 diff --git a/gas/configure.in b/gas/configure.in index b1f2c62..c80f3e3 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -451,7 +451,7 @@ changequote([,])dnl sh5*-*-netbsd*) fmt=elf em=nbsd ;; sh64*-*-netbsd*) fmt=elf em=nbsd ;; sh*-*-netbsdelf*) fmt=elf em=nbsd ;; - sh*-symbian-elf*) fmt=elf endian=little + sh*-*-symbianelf*) fmt=elf endian=little AC_DEFINE(TARGET_SYMBIAN, 1, [Define if target is Symbian OS.]) ;; sh-*-elf*) fmt=elf ;; diff --git a/ld/ChangeLog b/ld/ChangeLog index da8ea08..93695e0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2004-07-09 Nick Clifton <nickc@redhat.com> + + * configure.tgt: Change sh-sybmian-elf to sh-*-symbianelf. + 2004-07-06 Tomer Levi <Tomer.Levi@nsc.com> * Makefile.am (ALL_EMULATIONS): Add eelf32crx.o. @@ -2,7 +2,7 @@ * Support for the crx-elf target added. -* Support for the sh-symbian-elf target added. +* Support for the sh-symbianelf target added. * A new linker command line switch has been added which allows the hash table size to be set to a suitable prime value near to its argument. This switch diff --git a/ld/configure.tgt b/ld/configure.tgt index cade374..26e27fe 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -330,7 +330,7 @@ sh*-*-netbsdelf*) targ_emul=shelf_nbsd targ_extra_emuls=shlelf_nbsd ;; -sh*-symbian-elf*) +sh*-*-symbianelf*) targ_emul=shlsymbian ;; shle*-*-elf* | sh[1234]*le*-*-elf | shle*-*-kaos*) |