* elflink.c (elf_link_add_object_symbols): Revert accidental commit.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b794f3665c825693fb628007e6191126c9721bf7..806aa48ee0112647619a800dcc3e7c3416322ef0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-05  Nick Clifton  <nickc@redhat.com>
+
+       * elflink.c (elf_link_add_object_symbols): Revert accidental commit.
+
 2013-04-04  Alan Modra  <amodra@gmail.com>
 
        * bfd.c (bfd_error_type, bfd_errmsgs): Add bfd_error_missing_dso.

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 8a2bf3f235c142667036411d2a16ad4210473e84..99a1ddfa3d787f7b3e1ffddbdc4a159c3eb9affe 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4437,7 +4437,6 @@ error_free_dyn:
                 --no-add-needed is used and the reference was not
                 a weak one.  */
              if (old_bfd != NULL
-                 && h->ref_regular_nonweak
                  && (elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0)
                {
                  (*_bfd_error_handler)