diff options
| author | Nick Clifton <nickc@redhat.com> | 2003-04-30 12:03:58 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2003-04-30 12:03:58 +0000 |
| commit | 7ab7acd3928ca59813eee1a872529e1228ea251c (patch) | |
| tree | 1932b03f89fccb045ef5d0530f9897596d2402bb /bfd/elf32-h8300.c | |
| parent | 4d771a590888f7f4a55b83c4e8cc5f7e140cbd7a (diff) | |
| download | binutils-redhat-7ab7acd3928ca59813eee1a872529e1228ea251c.tar.gz | |
Do not crash when encountering relocs against the *ABS* section.carlton_dictionary-20030430-merge
Diffstat (limited to 'bfd/elf32-h8300.c')
| -rw-r--r-- | bfd/elf32-h8300.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c index 6008d5dec2..e43ed9d2ed 100644 --- a/bfd/elf32-h8300.c +++ b/bfd/elf32-h8300.c @@ -778,9 +778,12 @@ elf32_h8_relax_section (abfd, sec, link_info, again) isym = isymbuf + ELF32_R_SYM (irel->r_info); sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx); - symval = (isym->st_value - + sym_sec->output_section->vma - + sym_sec->output_offset); + symval = isym->st_value; + /* If the reloc is absolute, it will not have + a symbol or section associated with it. */ + if (sym_sec) + symval += sym_sec->output_section->vma + + sym_sec->output_offset; } else { @@ -1082,6 +1085,7 @@ elf32_h8_relax_section (abfd, sec, link_info, again) && value >= 0xffff00 && value <= 0xffffff)) { + bfd_boolean skip = FALSE; unsigned char code; /* Note that we've changed the relocs, section contents, @@ -1099,16 +1103,27 @@ elf32_h8_relax_section (abfd, sec, link_info, again) code = bfd_get_8 (abfd, contents + irel->r_offset - 1); - if ((code & 0xf0) == 0x00) - bfd_put_8 (abfd, - (code & 0xf) | 0x20, - contents + irel->r_offset - 2); - else if ((code & 0xf0) == 0x80) - bfd_put_8 (abfd, - (code & 0xf) | 0x30, - contents + irel->r_offset - 2); - else - abort (); + switch (code & 0xf0) + { + case 0x00: + bfd_put_8 (abfd, (code & 0xf) | 0x20, + contents + irel->r_offset - 2); + break; + case 0x80: + bfd_put_8 (abfd, (code & 0xf) | 0x30, + contents + irel->r_offset - 2); + break; + case 0x20: + case 0xa0: + /* Skip 32bit versions. */ + skip = TRUE; + break; + default: + abort (); + } + + if (skip) + break; /* Fix the relocation's type. */ irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), |