summaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2004-03-27 10:16:19 +0000
committerAlan Modra <amodra@bigpond.net.au>2004-03-27 10:16:19 +0000
commit0bc5ad979a1232bfd60755fedaf482fcdfc818a7 (patch)
tree6514fad8a3c652d16c5ec000a8649f722f9dddd8 /bfd
parent3dce1f0c86b342d3d1b6470f1b5bb8c580b1d696 (diff)
downloadgdb-0bc5ad979a1232bfd60755fedaf482fcdfc818a7.tar.gz
* elf64-mmix.c (mmix_elf_relocate_section): Restore code setting
"name" for global syms accidentally removed in 2004-03-20 change.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf64-mmix.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0647c4f5c90..0a7755f915c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2004-03-27 Alan Modra <amodra@bigpond.net.au>
+ * elf64-mmix.c (mmix_elf_relocate_section): Restore code setting
+ "name" for global syms accidentally removed in 2004-03-20 change.
+
+2004-03-27 Alan Modra <amodra@bigpond.net.au>
+
* elf-bfd.h (struct elf_reloc_cookie): Add r_sym_shift field.
* elflink.h: Replace all occurrences of sizeof (Elf_External_*)
where Elf_External_* is different for 64 and 32 bit, with
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 7f34a83b679..dda708601f4 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -1474,9 +1474,11 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
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;
+ name = bfd_elf_string_from_elf_section (input_bfd,
+ symtab_hdr->sh_link,
+ sym->st_name);
+ if (name == NULL)
+ name = bfd_section_name (input_bfd, sec);
}
else
{
@@ -1486,6 +1488,7 @@ mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
r_symndx, symtab_hdr, sym_hashes,
h, sec, relocation,
unresolved_reloc, undefined_signalled);
+ name = h->root.root.string;
}
r = mmix_final_link_relocate (howto, input_section,