darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compute 'name' for relocs against both local and global symbols.

Browse source
This commit is contained in:
Nick Clifton 2004-10-18 08:06:31 +00:00
parent 87e6234853
commit 00d962d155
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2004-10-18 Nick Clifton <nickc@redhat.com>
* elf32-xstormy16.c (xstormy16_elf_relocate_section): Compute
'name' for relocs against both local and global symbols.
2004-10-16 Daniel Jacobowitz <dan@debian.org> 2004-10-16 Daniel Jacobowitz <dan@debian.org>
* bfd-in2.h: Regenerate. * bfd-in2.h: Regenerate.

14
bfd/elf32-xstormy16.c
View file

@ -840,10 +840,6 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
sym = local_syms + r_symndx; sym = local_syms + r_symndx;
sec = local_sections [r_symndx]; sec = local_sections [r_symndx];
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
name = bfd_elf_string_from_elf_section
(input_bfd, symtab_hdr->sh_link, sym->st_name);
name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
} }
else else
{ {
@ -855,6 +851,16 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
unresolved_reloc, warned); unresolved_reloc, warned);
} }
if (h != NULL)
name = h->root.root.string;
else
{
name = (bfd_elf_string_from_elf_section
(input_bfd, symtab_hdr->sh_link, sym->st_name));
if (name == NULL || *name == '\0')
name = bfd_section_name (input_bfd, sec);
}
switch (ELF32_R_TYPE (rel->r_info)) switch (ELF32_R_TYPE (rel->r_info))
{ {
case R_XSTORMY16_24: case R_XSTORMY16_24: