2012-07-16 Sriraman Tallam <tmsriram@google.com>

	* gold.cc (queue_middle_tasks): Update function order only after
	deferred objects due to plugins are processed.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5f80c788e88aac03ea4ab93a590840bf421c1941..1e50690a939d26711ac3b1181ca84197f98ee38f 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-16  Sriraman Tallam  <tmsriram@google.com>
+
+       * gold.cc (queue_middle_tasks): Update function order only after
+       deferred objects due to plugins are processed.
+
 2012-07-11  Ian Lance Taylor  <iant@google.com>
 
        * arm.cc (Arm_relocate_functions::abs16): Remove unused typedef.

diff --git a/gold/gold.cc b/gold/gold.cc
index 013702fed878cef0e5d7c30bbb6859c84ea1cf47..dddf5ad674fc970541e485c08abd04474ecb29b1 100644 (file)
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -545,6 +545,14 @@ queue_middle_tasks(const General_options& options,
        }
     }
 
+  // Layout deferred objects due to plugins.
+  if (parameters->options().has_plugins())
+    {
+      Plugin_manager* plugins = parameters->options().plugins();
+      gold_assert(plugins != NULL);
+      plugins->layout_deferred_objects();
+    }
+
   /* If plugins have specified a section order, re-arrange input sections
      according to a specified section order.  If --section-ordering-file is
      also specified, do not do anything here.  */
@@ -559,14 +567,6 @@ queue_middle_tasks(const General_options& options,
        (*p)->update_section_layout(layout->get_section_order_map());
     }
 
-  // Layout deferred objects due to plugins.
-  if (parameters->options().has_plugins())
-    {
-      Plugin_manager* plugins = parameters->options().plugins();
-      gold_assert(plugins != NULL);
-      plugins->layout_deferred_objects();
-    }
-
   if (parameters->options().gc_sections()
       || parameters->options().icf_enabled())
     {