From: Cary Coutant <ccoutant@google.com>
Date: Mon, 17 Oct 2011 23:43:18 +0000 (+0000)
Subject: 	* readsyms.cc (Read_symbols::run): Don't queue an unblocker
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f475cf7b6c7de8970196755517e95831eb8e6b4b;p=binutils-gdb.git

	* readsyms.cc (Read_symbols::run): Don't queue an unblocker
	task for members of lib groups.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index c9306187ddb..391f015d4f7 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-17  Cary Coutant  <ccoutant@google.com>
+
+	* readsyms.cc (Read_symbols::run): Don't queue an unblocker
+	task for members of lib groups.
+
 2011-10-17  Cary Coutant  <ccoutant@google.com>
 
 	PR gold/13288
diff --git a/gold/readsyms.cc b/gold/readsyms.cc
index 1e50942a281..997472284ae 100644
--- a/gold/readsyms.cc
+++ b/gold/readsyms.cc
@@ -161,8 +161,10 @@ void
 Read_symbols::run(Workqueue* workqueue)
 {
   // If we didn't queue a new task, then we need to explicitly unblock
-  // the token.
-  if (!this->do_read_symbols(workqueue))
+  // the token. If the object is a member of a lib group, however,
+  // the token was already added to the list of locks for the task,
+  // and it will be unblocked automatically at the end of the task.
+  if (!this->do_read_symbols(workqueue) && this->member_ == NULL)
     workqueue->queue_soon(new Unblock_token(this->this_blocker_,
 					    this->next_blocker_));
 }