From: Ian Lance Taylor <iant@google.com>
Date: Sun, 14 Oct 2007 02:52:13 +0000 (+0000)
Subject: From Craig Silverstein: error if we see a dynamic object when the
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=866e97d9639bfa760111f6e1973fd059e6fc5817;p=pf3gnuchains%2Fpf3gnuchains3x.git

From Craig Silverstein: error if we see a dynamic object when the
-static option was given.
---

diff --git a/gold/gold.cc b/gold/gold.cc
index 5c8ce50d5c..97e5d3d043 100644
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -161,7 +161,15 @@ queue_middle_tasks(const General_options& options,
 		   Workqueue* workqueue)
 {
   // Now we have seen all the input files.
-  set_parameters_doing_static_link(!input_objects->any_dynamic());
+  const bool doing_static_link = !input_objects->any_dynamic();
+  set_parameters_doing_static_link(doing_static_link);
+  if (!doing_static_link && options.is_static())
+    {
+      // We print out just the first .so we see; there may be others.
+      fprintf(stderr, _("%s: cannot mix -static with dynamic object %s\n"),
+              program_name, (*input_objects->dynobj_begin())->name().c_str());
+      gold_exit(false);
+    }
 
   // Define some sections and symbols needed for a dynamic link.  This
   // handles some cases we want to see before we read the relocs.