2005-06-14 H.J. Lu <hongjiu.lu@intel.com>

	* elflink.c (_bfd_elf_merge_symbol): Fix a typo in comment.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3de70879f1b8e3569ddbcff2b35b68b6bc08084a..5e247d69dd798fd34a14122f11b210c5fb76f352 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elflink.c (_bfd_elf_merge_symbol): Fix a typo in comment.
+
 2005-06-14  Jakub Jelinek  <jakub@redhat.com>
 
        * elf.c (bfd_section_from_shdr): Fail if name is NULL.

diff --git a/bfd/elflink.c b/bfd/elflink.c
index d90be1c2b7fa407c09399ea0c482d46d007bd7cf..e404d3b644f174d4a724e1fe9287bc599b9a21b2 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1188,8 +1188,8 @@ _bfd_elf_merge_symbol (bfd *abfd,
   /* Handle the special case of an old common symbol merging with a
      new symbol which looks like a common symbol in a shared object.
      We change *PSEC and *PVALUE to make the new symbol look like a
-     common symbol, and let _bfd_generic_link_add_one_symbol will do
-     the right thing.  */
+     common symbol, and let _bfd_generic_link_add_one_symbol do the
+     right thing.  */
 
   if (newdyncommon
       && h->root.type == bfd_link_hash_common)