diff options
| author | Martin Liska <mliska@suse.cz> | 2014-10-17 11:37:35 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2014-10-17 09:37:35 +0000 |
| commit | 9d4ded759a1367ebe6588be36d0ea1410e24e3ca (patch) | |
| tree | 2bf956ce7b37fb76192a0ca38fdae6823d5b6e0e /gcc | |
| parent | 43c58950be209f57279c16f4663437956eb5a593 (diff) | |
| download | gcc-9d4ded759a1367ebe6588be36d0ea1410e24e3ca.zip gcc-9d4ded759a1367ebe6588be36d0ea1410e24e3ca.tar.gz gcc-9d4ded759a1367ebe6588be36d0ea1410e24e3ca.tar.bz2 | |
Temporary fix for PR63566.
* ipa-icf.c (sem_function::merge): Local flags are set to false
to enforce equal calling convention to be used.
* opts.c (common_handle_option): Indentation fix.
From-SVN: r216386
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-icf.c | 5 | ||||
| -rw-r--r-- | gcc/opts.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 704de2f..c316786 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-17 Martin Liska <mliska@suse.cz> + + * ipa-icf.c (sem_function::merge): Local flags are set to false + to enforce equal calling convention to be used. + * opts.c (common_handle_option): Indentation fix. + 2014-10-17 Marc Glisse <marc.glisse@inria.fr> * tree-into-ssa.c (is_old_name): Replace "new" with "old". diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index f7510b3..0e6bd9a 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -630,6 +630,11 @@ sem_function::merge (sem_item *alias_item) cgraph_node::create_alias (alias_func->decl, decl); alias->resolve_alias (original); + /* Workaround for PR63566 that forces equal calling convention + to be used. */ + alias->local.local = false; + original->local.local = false; + if (dump_file) fprintf (dump_file, "Callgraph alias has been created.\n\n"); } @@ -1982,8 +1982,8 @@ common_handle_option (struct gcc_options *opts, break; case OPT_fipa_icf: - opts->x_flag_ipa_icf_functions = value; - opts->x_flag_ipa_icf_variables = value; + opts->x_flag_ipa_icf_functions = value; + opts->x_flag_ipa_icf_variables = value; break; default: |