aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2013-04-05 09:08:28 +0000
committerNick Clifton <nickc@redhat.com>2013-04-05 09:08:28 +0000
commitc69ba956e3ea3f41672cd3bf4d9d27f91d6849c0 (patch)
tree8ea6b3f03ac2773219fe94a389195db02e4090d0
parent952781e82cc7dd01165447f137ea88f83f2c6bdf (diff)
downloadfsf-binutils-gdb-c69ba956e3ea3f41672cd3bf4d9d27f91d6849c0.zip
fsf-binutils-gdb-c69ba956e3ea3f41672cd3bf4d9d27f91d6849c0.tar.gz
fsf-binutils-gdb-c69ba956e3ea3f41672cd3bf4d9d27f91d6849c0.tar.bz2
* elflink.c (elf_link_add_object_symbols): Revert accidental commit.
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/elflink.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b794f36..806aa48 100644
--- 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 8a2bf3f..99a1ddf 100644
--- 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)