diff options
| -rw-r--r-- | bfd/ChangeLog | 12 | ||||
| -rw-r--r-- | bfd/elf32-m32r.c | 3 | ||||
| -rw-r--r-- | bfd/elf32-sh64.c | 3 | ||||
| -rw-r--r-- | bfd/elf64-mmix.c | 14 | ||||
| -rw-r--r-- | bfd/elf64-sh64.c | 3 | ||||
| -rw-r--r-- | bfd/elf64-sparc.c | 5 |
6 files changed, 26 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 997e4b22d51..4894d775b27 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2002-04-16 Alan Modra <amodra@bigpond.net.au> + + * elf32-m32r.c (m32r_elf_add_symbol_hook): Check the hash table + type rather than just assuming entries are ELF. + * elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise. + * elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise. + * elf64-sparc.c (sparc64_elf_add_symbol_hook): Likewise. + * elf64-mmix.c (mmix_elf_add_symbol_hook): Use bfd_link_hash_entry + rather than elf_link_hash_entry. + 2002-04-15 Richard Henderson <rth@redhat.com> * elf32-mips.c (mips_elf32_object_p): Revert 0404 fragment: allow @@ -8,7 +18,7 @@ * opncls.c (bfd_close): Write contents if writeable. Minor formatting tidy-ups. -2002-04-15 Alan Modra <alan@weed.local> +2002-04-15 Alan Modra <amodra@bigpond.net.au> * elf32-ppc.c (ppc_elf_add_symbol_hook): Check the hash table type. diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 1ce1827acae..b3b62204893 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -838,7 +838,8 @@ m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) { if (! info->relocateable && (*namep)[0] == '_' && (*namep)[1] == 'S' - && strcmp (*namep, "_SDA_BASE_") == 0) + && strcmp (*namep, "_SDA_BASE_") == 0 + && info->hash->creator->flavour == bfd_target_elf_flavour) { /* This is simpler than using _bfd_elf_create_linker_section (our needs are simpler than ppc's needs). Also diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c index 5c85d36c2dd..5e7ccdd6822 100644 --- a/bfd/elf32-sh64.c +++ b/bfd/elf32-sh64.c @@ -389,7 +389,8 @@ sh64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) bfd_vma *valp; { /* We want to do this for relocatable as well as final linking. */ - if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL) + if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL + && info->hash->creator->flavour == bfd_target_elf_flavour) { struct elf_link_hash_entry *h; diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 3bda435c987..96146ed016e 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -1953,16 +1953,16 @@ mmix_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX)) == 0) { /* See if we have another one. */ - struct elf_link_hash_entry *h - = (struct elf_link_hash_entry *) bfd_link_hash_lookup (info->hash, - *namep, - false, - false, false); + struct bfd_link_hash_entry *h = bfd_link_hash_lookup (info->hash, + *namep, + false, + false, + false); - if (h != NULL && h->root.type != bfd_link_hash_undefined) + if (h != NULL && h->type != bfd_link_hash_undefined) { /* How do we get the asymbol (or really: the filename) from h? - h->root.u.def.section->owner is NULL. */ + h->u.def.section->owner is NULL. */ ((*_bfd_error_handler) (_("%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"), bfd_get_filename (abfd), *namep, diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index aac491af4a6..b168934e963 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -2929,7 +2929,8 @@ sh64_elf64_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) bfd_vma *valp; { /* We want to do this for relocatable as well as final linking. */ - if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL) + if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL + && info->hash->creator->flavour == bfd_target_elf_flavour) { struct elf_link_hash_entry *h; diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 8df7e319522..4933f8de801 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -1385,9 +1385,8 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) *namep = NULL; return true; } - else if (! *namep || ! **namep) - return true; - else + else if (*namep && **namep + && info->hash->creator->flavour == bfd_target_elf_flavour) { int i; struct sparc64_elf_app_reg *p; |