invoke.texi (-fwhopr): Merge into -flto section.

	* doc/invoke.texi (-fwhopr): Merge into -flto section.
	(-flto-partition): Document none.
	* gcc.c (LINK_COMMAND_SPEC): Remove -fwhopr.
	* lto-wrapper.c: Update comment.
	(run_gcc): Update LTO option parsing.
	* opts.c (finish_options): add support -flto-partition=none
	(common_handle_option): Remove fwhopr.
	* common.opt: Turn fwhopr into flto.
	* collect2.c (main): Update option handling.
	* cgraphunit.c (cgraph_decide_is_function_needed): Remove flag_whopr.
	* ipa-split.c (execute_split_functions): Remove flag_whopr.
	* ipa.c (function_and_variable_visibility): Remove flag_whopr.
	* ipa-prop.c (ipa_compute_jump_functions): Remove flag_whopr.
	* varpool.c (decide_is_variable_needed): Remove flag_whopr.
	
	* gcc.dg/20081223-1.c: Update LTO options.
	* gcc.dg/lto/20090206-1_0.c: Update LTO options.
	* gcc.dg/lto/20081118_0.c: Update LTO options.
	* gcc.dg/lto/ipareference_0.c: Update LTO options.
	* gcc.dg/lto/20100423-2_0.c: Update LTO options.
	* gcc.dg/lto/20081201-1_0.c: Update LTO options.
	* gcc.dg/lto/ipacp_0.c: Update LTO options.
	* gcc.dg/lto/20090116_0.c: Update LTO options.
	* gcc.dg/lto/20091015-1_0.c: Update LTO options.
	* gcc.dg/lto/20090126-2_0.c: Update LTO options.
	* gcc.dg/lto/20081202-2_0.c: Update LTO options.
	* gcc.dg/lto/20081204-1_0.c: Update LTO options.
	* gcc.dg/lto/const-uniq_0.c: Update LTO options.
	* gcc.dg/lto/20081224_0.c: Update LTO options.
	* gcc.dg/lto/20090219_0.c: Update LTO options.
	* gcc.dg/lto/ipareference2_0.c: Update LTO options.
	* gcc.dg/lto/20090206-2_0.c: Update LTO options.
	* gcc.dg/lto/20081115_0.c: Update LTO options.
	* gcc.dg/lto/20081201-2_0.c: Update LTO options.
	* gcc.dg/lto/20081120-2_0.c: Update LTO options.
	* gcc.dg/lto/materialize-1_0.c: Update LTO options.
	* gcc.dg/lto/20090126-1_0.c: Update LTO options.
	* gcc.dg/lto/20081202-1_0.c: Update LTO options.
	* gcc.dg/lto/noreturn-1_0.c: Update LTO options.
	* g++.dg/20090107-1.C: Update LTO options.
	* g++.dg/lto/pr45679-2_0.C: Update LTO options.
	* g++.dg/lto/20081123_0.C: Update LTO options.
	* g++.dg/lto/20090313_0.C: Update LTO options.
	* g++.dg/lto/20081125_0.C: Update LTO options.
	* g++.dg/lto/20081109-1_0.C: Update LTO options.
	* g++.dg/lto/20081219_0.C: Update LTO options.
	* g++.dg/lto/20100724-1_0.C: Update LTO options.
	* g++.dg/lto/20081204-1_0.C: Update LTO options.
	* g++.dg/lto/20090303_0.C: Update LTO options.
	* g++.dg/lto/20100723-1_0.C: Update LTO options.
	* g++.dg/lto/pr45679-1_0.C: Update LTO options.
	* g++.dg/lto/20090128_0.C: Update LTO options.
	* g++.dg/lto/20081204-2_0.C: Update LTO options.
	* g++.dg/lto/20090302_0.C: Update LTO options.
	* g++.dg/lto/20081119-1_0.C: Update LTO options.
	* g++.dg/lto/20081118_0.C: Update LTO options.
	* g++.dg/20090121-1.C: Update LTO options.
	* objc.dg/lto/lto.exp: Update LTO options.
	* lib/lto.exp: Update LTO options.
	* lib/gcc-dg.exp: Update LTO options.
	* lib/c-torture.exp: Update LTO options.
	* obj-c++.dg/lto/lto.exp: Update LTO options.

From-SVN: r166625

1 files changed, 10 insertions, 13 deletions

diff --git a/gcc/opts.c b/gcc/opts.c
index 53ae596..085bc25 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1218,7 +1218,7 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set)
       opts->x_flag_ipa_struct_reorg = 0;
     }
 
-  if (opts->x_flag_lto || opts->x_flag_whopr)
+  if (opts->x_flag_lto)
     {
 #ifdef ENABLE_LTO
       opts->x_flag_generate_lto = 1;
@@ -1231,20 +1231,17 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set)
       error ("LTO support has not been enabled in this configuration");
 #endif
     }
-  if (opts->x_flag_lto_partition_balanced || opts->x_flag_lto_partition_1to1)
+  if ((opts->x_flag_lto_partition_balanced != 0) + (opts->x_flag_lto_partition_1to1 != 0)
+       + (opts->x_flag_lto_partition_none != 0) >= 1)
     {
-      if (opts->x_flag_lto_partition_balanced
-	  && opts->x_flag_lto_partition_1to1)
+      if ((opts->x_flag_lto_partition_balanced != 0)
+	   + (opts->x_flag_lto_partition_1to1 != 0)
+	   + (opts->x_flag_lto_partition_none != 0) > 1)
 	error ("only one -flto-partition value can be specified");
-      if (!opts->x_flag_whopr && !opts->x_flag_wpa && !opts->x_flag_ltrans)
-	error ("-flto-partition has no effect without -fwhopr");
+      if (!opts->x_flag_lto && !opts->x_flag_wpa && !opts->x_flag_ltrans)
+	error ("-flto-partition has no effect without -flto");
     }
 
-  /* Reconcile -flto and -fwhopr.  Set additional flags as appropriate and
-     check option consistency.  */
-  if (opts->x_flag_lto && opts->x_flag_whopr)
-    error ("-flto and -fwhopr are mutually exclusive");
-
   /* We initialize opts->x_flag_split_stack to -1 so that targets can set a
      default value if they choose based on other options.  */
   if (opts->x_flag_split_stack == -1)
@@ -2152,8 +2149,8 @@ common_handle_option (struct gcc_options *opts,
       dc->pedantic_errors = 1;
       break;
 
-    case OPT_fwhopr:
-      opts->x_flag_whopr = "";
+    case OPT_flto:
+      opts->x_flag_lto = "";
       break;
 
     case OPT_w: