aboutsummaryrefslogtreecommitdiff
path: root/bfd/elf32-xstormy16.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2004-10-18 08:06:31 +0000
committerNick Clifton <nickc@redhat.com>2004-10-18 08:06:31 +0000
commit00d962d155e1cff6ce144f60f81a416e0f9b872e (patch)
tree90caa8be548d00120e5f93906592bb7726d37c95 /bfd/elf32-xstormy16.c
parent87e62348537a588c497fd570ef9b13ea56e3b442 (diff)
downloadgdb-00d962d155e1cff6ce144f60f81a416e0f9b872e.zip
gdb-00d962d155e1cff6ce144f60f81a416e0f9b872e.tar.gz
gdb-00d962d155e1cff6ce144f60f81a416e0f9b872e.tar.bz2
Compute 'name' for relocs against both local and global symbols.gdb_6_3-branchpoint
Diffstat (limited to 'bfd/elf32-xstormy16.c')
-rw-r--r--bfd/elf32-xstormy16.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c
index e03cc77..8c96348 100644
--- a/bfd/elf32-xstormy16.c
+++ b/bfd/elf32-xstormy16.c
@@ -840,10 +840,6 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
sym = local_syms + r_symndx;
sec = local_sections [r_symndx];
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
{
@@ -855,6 +851,16 @@ xstormy16_elf_relocate_section (output_bfd, info, input_bfd, input_section,
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))
{
case R_XSTORMY16_24: