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

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6c5078e737489e933a6330ab6d08bcb5a2073893..df835359ad95dbe3fa6c6b3a390061af84a1f4b8 100644 (file)
--- 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 64a8539d2ff1e1531d0ec90fccb30404821d7d86..fe9a00e023d372b44e66bb54d71e85d3c9a596ab 100644 (file)
--- 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"));