* opts.c (finish_options): Do not error on -flto-partition alone.

	* options.c (gfc_post_options): Remove flag_whopr.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166632 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5e85a2..3f59637 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2010-11-11  Jan Hubicka  <jh@suse.cz>
 
+       * opts.c (finish_options): Do not error on -flto-partition alone.
+
        * doc/invoke.texi (-fwhopr): Merge into -flto section.
        (-flto-partition): Document none.
        * gcc.c (LINK_COMMAND_SPEC): Remove -fwhopr.

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d6afdc4..3e04b60 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-11  Jan Hubicka  <jh@suse.cz>
+
+       * options.c (gfc_post_options): Remove flag_whopr.
+
 2010-11-11  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/46413

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 36dd9c8..ee17037 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -258,7 +258,7 @@ gfc_post_options (const char **pfilename)
     gfc_option.flag_whole_file = 1;
 
   /* Enable whole-file mode if LTO is in effect.  */
-  if (flag_lto || flag_whopr)
+  if (flag_lto)
     gfc_option.flag_whole_file = 1;
 
   /* Fortran allows associative math - but we cannot reassociate if

diff --git a/gcc/opts.c b/gcc/opts.c
index 085bc25..f5f60b5 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1238,8 +1238,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set)
           + (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_lto && !opts->x_flag_wpa && !opts->x_flag_ltrans)
-       error ("-flto-partition has no effect without -flto");
     }
 
   /* We initialize opts->x_flag_split_stack to -1 so that targets can set a