From: Cary Coutant <ccoutant@google.com>
Date: Wed, 15 Feb 2012 00:56:16 +0000 (+0000)
Subject: 	* options.cc (General_options::finalize): Disallow -pie and -static.
X-Git-Tag: cygwin-1_7_11-release~88
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9fa4a63414294ef4eb46f6acb5b649382620f2a;p=external%2Fbinutils.git

	* options.cc (General_options::finalize): Disallow -pie and -static.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6c5078e..df83535 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-14  Cary Coutant  <ccoutant@google.com>
+
+	* options.cc (General_options::finalize): Disallow -pie and -static.
+
 2012-02-03  Doug Kwan  <dougkwan@google.com>
 
 	* arm.cc (Arm_relocate_functions::abs8,
diff --git a/gold/options.cc b/gold/options.cc
index 64a8539..fe9a00e 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -1203,6 +1203,8 @@ General_options::finalize()
     gold_fatal(_("-shared and -static are incompatible"));
   if (this->shared() && this->pie())
     gold_fatal(_("-shared and -pie are incompatible"));
+  if (this->pie() && this->is_static())
+    gold_fatal(_("-pie and -static are incompatible"));
 
   if (this->shared() && this->relocatable())
     gold_fatal(_("-shared and -r are incompatible"));