* elflink.h (elf_link_add_object_symbols): Don't warn about type

	or size changes because of a weak symbol.
PR 11827.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5597d4a7402c540a922687787ca85108d4303a5d..97ce5f866ce9d04bc0fd8cc37cd976be3c020b05 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
 Thu Mar 13 14:08:53 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+       * elflink.h (elf_link_add_object_symbols): Don't warn about type
+       or size changes because of a weak symbol.
+
        * cisco-core.c (SIGEMT): Define if not defined.
 
 Wed Mar 12 21:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>

diff --git a/bfd/elflink.h b/bfd/elflink.h
index b6a5d580a30460d0816137eaf6567c9f5db3aecd..dee5a8a66f651236858bff645bea110ffd8cc3d5 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -861,9 +861,11 @@ elf_link_add_object_symbols (abfd, info)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
          /* It's OK to change the type if it used to be a weak
-             definition.  */
+             definition, or if the current definition is weak (and
+             hence might be ignored).  */
          if (h->root.type == bfd_link_hash_defweak
-             || h->root.type == bfd_link_hash_undefweak)
+             || h->root.type == bfd_link_hash_undefweak
+             || bind == STB_WEAK)
            type_change_ok = true;
 
          /* It's OK to change the size if it used to be a weak