* elf32-cris.c (elf_cris_copy_indirect_symbol): Return without

	action for symbols other than bfd_link_hash_indirect.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0836a4679f79965c672d18686b026a0944d0af82..40678eea71e4a873ea7183b0a99707d2d51ead55 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-17  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf32-cris.c (elf_cris_copy_indirect_symbol): Return without
+       action for symbols other than bfd_link_hash_indirect.
+
 2008-12-15  Hans-Peter Nilsson  <hp@axis.com>
 
        * elf32-cris.c (elf_cris_copy_indirect_symbol): New function.

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 389798db7d9431a1fcd6aa07f1e08d36534c6e44..2f6b4d86a1eacb9d4c52350e07b89bdd22cd3e91 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3024,6 +3024,11 @@ elf_cris_copy_indirect_symbol (struct bfd_link_info *info,
   edir = (struct elf_cris_link_hash_entry *) dir;
   eind = (struct elf_cris_link_hash_entry *) ind;
 
+  /* Only indirect symbols are replaced; we're not interested in
+     updating any of EIND's fields for other symbols.  */
+  if (eind->root.root.type != bfd_link_hash_indirect)
+    return;
+
   BFD_ASSERT (edir->pcrel_relocs_copied == NULL);
   BFD_ASSERT (edir->gotplt_offset == 0 || eind->gotplt_offset == 0);