From: Martin Liska <mliska@suse.cz>
Date: Fri, 17 Oct 2014 09:37:35 +0000 (+0200)
Subject: Temporary fix for PR63566.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d4ded759a1367ebe6588be36d0ea1410e24e3ca;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 704de2f1f80..c3167864c1b 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 f7510b33975..0e6bd9a6073 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");
     }
diff --git a/gcc/opts.c b/gcc/opts.c
index dc8ddf4cd37..30541962018 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -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: