summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-25 10:10:31 +0000
committerrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-25 10:10:31 +0000
commitfa8ceef27894b9a7ea0529e9ee66d4056fac8e6f (patch)
tree528e26e76737fe5d79e0b37b16bd019f47ce77d8
parentde48ad323bb0c177ddc436a31cc8bd3cf6e7b37f (diff)
downloadgcc-fa8ceef27894b9a7ea0529e9ee66d4056fac8e6f.tar.gz
2014-03-25 Richard Biener <rguenther@suse.de>
* lto-wrapper.c (merge_and_complain): Handle OPT_fPIE like OPT_fpie. (run_gcc): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208807 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lto-wrapper.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c8fbeaf43b..edb45ecc95d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-25 Richard Biener <rguenther@suse.de>
+
+ * lto-wrapper.c (merge_and_complain): Handle OPT_fPIE like
+ OPT_fpie.
+ (run_gcc): Likewise.
+
2014-03-25 Jakub Jelinek <jakub@redhat.com>
* combine.c (simplify_compare_const): Add MODE argument.
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index 8e9a566713c..1607ab3bff4 100644
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -406,6 +406,7 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
/* Fallthru. */
case OPT_fPIC:
case OPT_fpic:
+ case OPT_fPIE:
case OPT_fpie:
case OPT_fcommon:
case OPT_fexceptions:
@@ -671,6 +672,7 @@ run_gcc (unsigned argc, char *argv[])
{
case OPT_fPIC:
case OPT_fpic:
+ case OPT_fPIE:
case OPT_fpie:
case OPT_fcommon:
case OPT_fexceptions: