2011-09-19 Sriraman Tallam <tmsriram@google.com>

	* plugin.h (should_defer_layout): Modify to check for any_claimed_.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index f1ed09e607d4797d3ddf768235b6e505923d181e..2139fbfd0f753845f4ad73d68ad9d82dfd17506f 100644 (file)
--- 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 8f1db67d288d247d1587b3af3efd9a4ef35aa3eb..4c9445a8c4315fc60d99b8e289724a851a7e5c15 100644 (file)
--- 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