From: amodra <amodra>
Date: Sat, 27 Mar 2004 10:16:18 +0000 (+0000)
Subject: 	* elf64-mmix.c (mmix_elf_relocate_section): Restore code setting
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6729ac7b92fb8f330b48d44cc936b595982c644;p=pf3gnuchains%2Fsourceware.git

	* elf64-mmix.c (mmix_elf_relocate_section): Restore code setting
	"name" for global syms accidentally removed in 2004-03-20 change.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0647c4f5c9..0a7755f915 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 7f34a83b67..dda708601f 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,