* elf32-cris.c (elf_cris_copy_indirect_symbol): For other symbol

	types than bfd_link_hash_indirect, before early return, call
	_bfd_elf_link_hash_copy_indirect.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c2cc5e3c4720f8ad18385442a502ba741d318e30..7539164a865fbb664e206bc6f7789f5f320c69ac 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-19  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf32-cris.c (elf_cris_copy_indirect_symbol): For other symbol
+       types than bfd_link_hash_indirect, before early return, call
+       _bfd_elf_link_hash_copy_indirect.
+
 2009-01-19  Andrew Stubbs  <ams@codesourcery.com>
 
        * elf-attrs.c (vendor_set_obj_attr_contents): Support tag ordering.

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index dbc00ba60890e06cdc83dca44efb07d2752b8fc4..4b59d33e0383cdda0305c7c0db73c0c5be04fb77 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3055,7 +3055,11 @@ elf_cris_copy_indirect_symbol (struct bfd_link_info *info,
   /* 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;
+    {
+      /* Still, we need to copy flags for e.g. weak definitions.  */
+      _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+      return;
+    }
 
   BFD_ASSERT (edir->pcrel_relocs_copied == NULL);
   BFD_ASSERT (edir->gotplt_offset == 0 || eind->gotplt_offset == 0);