diff options
| author | Alan Modra <amodra@gmail.com> | 2008-03-02 22:15:39 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2008-03-02 22:15:39 +0000 |
| commit | 89200bf844501076657b4995444d08f4efc9e882 (patch) | |
| tree | 991a64342e50e8c51b8544958e712b3ad3824e0d /bfd/elf32-ppc.c | |
| parent | a42dfef46244bc3a28e64287a863065eaa00ecb9 (diff) | |
| download | fsf-binutils-gdb-89200bf844501076657b4995444d08f4efc9e882.zip fsf-binutils-gdb-89200bf844501076657b4995444d08f4efc9e882.tar.gz fsf-binutils-gdb-89200bf844501076657b4995444d08f4efc9e882.tar.bz2 | |
* elf32-ppc.c (allocate_dynrelocs): Discard relocs on
undefined symbols with internal or hidden visibility.
(ppc_elf_relocate_section): Likewise. Use SYMBOL_CALLS_LOCAL
rather than SYMBOL_REFERENCES_LOCAL on branches. Don't
return immediately on dynamic reloc error.
Diffstat (limited to 'bfd/elf32-ppc.c')
| -rw-r--r-- | bfd/elf32-ppc.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 47a2e79..c7f419a 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -4811,6 +4811,13 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) } } + /* Discard relocs on undefined symbols that must be local. */ + if (eh->dyn_relocs != NULL + && h->root.type == bfd_link_hash_undefined + && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN + || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)) + eh->dyn_relocs = NULL; + /* Also discard relocs on undefined weak syms with non-default visibility. */ if (eh->dyn_relocs != NULL @@ -6440,7 +6447,7 @@ ppc_elf_relocate_section (bfd *output_bfd, case R_PPC_REL14_BRNTAKEN: /* If these relocations are not to a named symbol, they can be handled right here, no need to bother the dynamic linker. */ - if (SYMBOL_REFERENCES_LOCAL (info, h) + if (SYMBOL_CALLS_LOCAL (info, h) || h == htab->elf.hgot) break; /* fall through */ @@ -6458,9 +6465,12 @@ ppc_elf_relocate_section (bfd *output_bfd, break; if ((info->shared - && (h == NULL - || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT - || h->root.type != bfd_link_hash_undefweak) + && !(h != NULL + && ((h->root.type == bfd_link_hash_undefined + && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN + || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)) + || (h->root.type == bfd_link_hash_undefweak + && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT))) && (MUST_BE_DYN_RELOC (r_type) || !SYMBOL_CALLS_LOCAL (info, h))) || (ELIMINATE_COPY_RELOCS @@ -6503,7 +6513,6 @@ ppc_elf_relocate_section (bfd *output_bfd, } skip = 0; - outrel.r_offset = _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset); @@ -6515,7 +6524,10 @@ ppc_elf_relocate_section (bfd *output_bfd, if (skip) memset (&outrel, 0, sizeof outrel); - else if (!SYMBOL_REFERENCES_LOCAL (info, h)) + else if ((h != NULL + && (h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak)) + || !SYMBOL_REFERENCES_LOCAL (info, h)) { unresolved_reloc = FALSE; outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); @@ -6529,14 +6541,14 @@ ppc_elf_relocate_section (bfd *output_bfd, outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE); else { - long indx; + long indx = 0; if (bfd_is_abs_section (sec)) - indx = 0; + ; else if (sec == NULL || sec->owner == NULL) { bfd_set_error (bfd_error_bad_value); - return FALSE; + ret = FALSE; } else { |