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

gcc/ChangeLog

+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".

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");
     }

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: