From 8bb50e5ce09c531440ec0c1e73b24c3b0a945c69 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 4 May 2012 11:47:06 +0000 Subject: [PATCH] re PR lto/50602 (ICE in tree_nrv, at tree-nrv.c:155 during large LTO build) 2012-05-04 Richard Guenther PR lto/50602 * lto-wrapper.c (merge_and_complain): Complain about mismatches of -freg-struct-return and -fpcc-struct-return. (run_gcc): Pass through -freg-struct-return and -fpcc-struct-return from the input file options and ignore those from the link command line. From-SVN: r187155 --- gcc/ChangeLog | 9 +++++++++ gcc/lto-wrapper.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 72e3264c345..64033090395 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2012-05-04 Richard Guenther + + PR lto/50602 + * lto-wrapper.c (merge_and_complain): Complain about mismatches + of -freg-struct-return and -fpcc-struct-return. + (run_gcc): Pass through -freg-struct-return and -fpcc-struct-return + from the input file options and ignore those from the link + command line. + 2012-05-04 Richard Guenther PR tree-optimization/53168 diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index 1c9aa833dbc..b656db251fa 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -414,6 +414,16 @@ merge_and_complain (struct cl_decoded_option **decoded_options, if (j == *decoded_options_count) append_option (decoded_options, decoded_options_count, foption); break; + + case OPT_freg_struct_return: + case OPT_fpcc_struct_return: + for (j = 0; j < *decoded_options_count; ++j) + if ((*decoded_options)[j].opt_index == foption->opt_index) + break; + if (j == *decoded_options_count) + fatal ("Option %s not used consistently in all LTO input files", + foption->orig_option_with_args_text); + break; } } } @@ -558,6 +568,8 @@ run_gcc (unsigned argc, char *argv[]) case OPT_fcommon: case OPT_fexceptions: case OPT_fgnu_tm: + case OPT_freg_struct_return: + case OPT_fpcc_struct_return: break; default: @@ -619,6 +631,12 @@ run_gcc (unsigned argc, char *argv[]) /* We've handled these LTO options, do not pass them on. */ continue; + case OPT_freg_struct_return: + case OPT_fpcc_struct_return: + /* Ignore these, they are determined by the input files. + ??? We fail to diagnose a possible mismatch here. */ + continue; + default: break; }