Properly handle common symbol and weak function

[external/binutils.git] / bfd / ChangeLog

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7a4334f..f38d4cc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,20 @@
+2012-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/14591
+       * elf-bfd.h (_bfd_elf_merge_symbol): Add an argument to return 
+       if the old symbol is weak.
+
+       * elf32-sh-symbian.c (sh_symbian_relocate_section): Update
+       _bfd_elf_merge_symbol call.
+
+       * elflink.c (_bfd_elf_merge_symbol): Add an argument to return
+       if the old symbol is weak.
+       (_bfd_elf_add_default_symbol): Update _bfd_elf_merge_symbol
+       call.
+       (elf_link_add_object_symbols): Don't update symbol type from a
+       weak definition.  Update symbol type from a common symbol when
+       overriding a weak symbol.
+
 2012-09-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf32-i386.c (elf_i386_convert_mov_to_lea): Ignore discarded