aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@google.com>2011-10-17 23:43:18 +0000
committerCary Coutant <ccoutant@google.com>2011-10-17 23:43:18 +0000
commitf475cf7b6c7de8970196755517e95831eb8e6b4b (patch)
treef4a02128b952d18773a894486808e4c031327a5b /gold/readsyms.cc
parentFixed several recent ChangeLog entries to remove "gold/" from filenames. (diff)
downloadbinutils-gdb-f475cf7b6c7de8970196755517e95831eb8e6b4b.tar.gz
binutils-gdb-f475cf7b6c7de8970196755517e95831eb8e6b4b.tar.bz2
binutils-gdb-f475cf7b6c7de8970196755517e95831eb8e6b4b.zip
* readsyms.cc (Read_symbols::run): Don't queue an unblocker
task for members of lib groups.
Diffstat (limited to 'gold/readsyms.cc')
-rw-r--r--gold/readsyms.cc6
1 files changed, 4 insertions, 2 deletions
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_));
}