diff options
author | Alan Modra <amodra@bigpond.net.au> | 2008-09-15 23:41:55 +0000 |
---|---|---|
committer | Alan Modra <amodra@bigpond.net.au> | 2008-09-15 23:41:55 +0000 |
commit | 01be0a4260a9395410413ac3340ea01b5cfead23 (patch) | |
tree | 05a21f8c5df39d6e8a237dd4614e6dcce9888f0c /bfd/elf32-ppc.c | |
parent | ee870ed9fa3fbc20687568c93b7950dcfbbc91c1 (diff) | |
download | binutils-redhat-01be0a4260a9395410413ac3340ea01b5cfead23.tar.gz |
PR 6888
* elf32-ppc.c (ppc_elf_relocate_section): Handle NULL symbol section
on R_PPC_TOC16, R_PPC_SDAREL16, R_PPC_EMB_SDA2REL, R_PPC_EMB_SDA21,
R_PPC_EMB_RELSDA, R_PPC_SECTOFF* relocs.
Diffstat (limited to 'bfd/elf32-ppc.c')
-rw-r--r-- | bfd/elf32-ppc.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 84e72b8a04..8720b0b68b 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -6971,12 +6971,15 @@ ppc_elf_relocate_section (bfd *output_bfd, an embedded ELF object, for which the .got section acts like the AIX .toc section. */ case R_PPC_TOC16: /* phony GOT16 relocations */ - BFD_ASSERT (sec != NULL); - BFD_ASSERT (bfd_is_und_section (sec) - || strcmp (bfd_get_section_name (abfd, sec), ".got") == 0 + if (sec == NULL || sec->output_section == NULL) + { + unresolved_reloc = TRUE; + break; + } + BFD_ASSERT (strcmp (bfd_get_section_name (abfd, sec), ".got") == 0 || strcmp (bfd_get_section_name (abfd, sec), ".cgot") == 0); - addend -= sec->output_section->vma + sec->output_offset + 0x8000; + addend -= sec->output_section->vma + sec->output_offset + 0x8000; break; case R_PPC_PLTREL24: @@ -7013,7 +7016,12 @@ ppc_elf_relocate_section (bfd *output_bfd, const char *name; struct elf_link_hash_entry *sh; - BFD_ASSERT (sec != NULL); + if (sec == NULL || sec->output_section == NULL) + { + unresolved_reloc = TRUE; + break; + } + name = bfd_get_section_name (abfd, sec->output_section); if (! ((CONST_STRNEQ (name, ".sdata") && (name[6] == 0 || name[6] == '.')) @@ -7041,7 +7049,12 @@ ppc_elf_relocate_section (bfd *output_bfd, const char *name; struct elf_link_hash_entry *sh; - BFD_ASSERT (sec != NULL); + if (sec == NULL || sec->output_section == NULL) + { + unresolved_reloc = TRUE; + break; + } + name = bfd_get_section_name (abfd, sec->output_section); if (! (CONST_STRNEQ (name, ".sdata2") || CONST_STRNEQ (name, ".sbss2"))) @@ -7073,7 +7086,12 @@ ppc_elf_relocate_section (bfd *output_bfd, int reg; struct elf_link_hash_entry *sh; - BFD_ASSERT (sec != NULL); + if (sec == NULL || sec->output_section == NULL) + { + unresolved_reloc = TRUE; + break; + } + name = bfd_get_section_name (abfd, sec->output_section); if (((CONST_STRNEQ (name, ".sdata") && (name[6] == 0 || name[6] == '.')) @@ -7086,7 +7104,6 @@ ppc_elf_relocate_section (bfd *output_bfd, + sh->root.u.def.section->output_offset + sh->root.u.def.section->output_section->vma); } - else if (CONST_STRNEQ (name, ".sdata2") || CONST_STRNEQ (name, ".sbss2")) { @@ -7096,13 +7113,11 @@ ppc_elf_relocate_section (bfd *output_bfd, + sh->root.u.def.section->output_offset + sh->root.u.def.section->output_section->vma); } - else if (strcmp (name, ".PPC.EMB.sdata0") == 0 || strcmp (name, ".PPC.EMB.sbss0") == 0) { reg = 0; } - else { (*_bfd_error_handler) @@ -7132,7 +7147,11 @@ ppc_elf_relocate_section (bfd *output_bfd, case R_PPC_SECTOFF_LO: case R_PPC_SECTOFF_HI: case R_PPC_SECTOFF_HA: - BFD_ASSERT (sec != NULL); + if (sec == NULL || sec->output_section == NULL) + { + unresolved_reloc = TRUE; + break; + } addend -= sec->output_section->vma; break; |