diff --git a/gold/ChangeLog b/gold/ChangeLog
index f1ed09e607..2139fbfd0f 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-19  Sriraman Tallam  <tmsriram@google.com>
+
+	* plugin.h (should_defer_layout): Modify to check for any_claimed_.
+
 2011-09-19  Cary Coutant  <ccoutant@google.com>
 
 	* incremental.cc (can_incremental_update): Fix typo in comment.
diff --git a/gold/plugin.h b/gold/plugin.h
index 8f1db67d28..4c9445a8c4 100644
--- a/gold/plugin.h
+++ b/gold/plugin.h
@@ -243,7 +243,7 @@ class Plugin_manager
   // and we are still in the initial input phase.
   bool
   should_defer_layout() const
-  { return !this->objects_.empty() && !this->in_replacement_phase_; }
+  { return this->any_claimed_ && !this->in_replacement_phase_; }
 
   // Add a regular object to the deferred layout list.  These are
   // objects whose layout has been deferred until after the