diff options
| author | Cary Coutant <ccoutant@google.com> | 2012-02-15 00:56:16 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2012-02-15 00:56:16 +0000 |
| commit | f9fa4a63414294ef4eb46f6acb5b649382620f2a (patch) | |
| tree | 587e535088c631fecda494d63bd3a2dd5115bd4a /gold | |
| parent | 9ad44fdb9d2da12d222c018a2d281e5fab3ed641 (diff) | |
| download | gdb-f9fa4a63414294ef4eb46f6acb5b649382620f2a.zip gdb-f9fa4a63414294ef4eb46f6acb5b649382620f2a.tar.gz gdb-f9fa4a63414294ef4eb46f6acb5b649382620f2a.tar.bz2 | |
* options.cc (General_options::finalize): Disallow -pie and -static.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 4 | ||||
| -rw-r--r-- | gold/options.cc | 2 |
2 files changed, 6 insertions, 0 deletions
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")); |