* common.opt (flag_gcse_sm): Disable by default.

	(flag_gcse_las): Likewise.
	(flag_web): Likewise.  Create from this file.
	* flags.h: Remove flag_web declaration.
	* toplev.c (flag_web): Likewise.
	(process_options): Never set flag_web.


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

4 files changed, 13 insertions, 16 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11506d88db5..e90e94fd379 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2004-09-28  Steven Bosscher  <stevenb@suse.de>
 
+	* common.opt (flag_gcse_sm): Disable by default.
+	(flag_gcse_las): Likewise.
+	(flag_web): Likewise.  Create from this file.
+	* flags.h: Remove flag_web declaration.
+	* toplev.c (flag_web): Likewise.
+	(process_options): Never set flag_web.
+
+2004-09-28  Steven Bosscher  <stevenb@suse.de>
+
 	* Makefile.in (tree-ssa-propagate.o): Depend on vec.h.
 	* tree-ssa-propagate.c: Include vec.h.
 	(interesting_ssa_edges, varying_ssa_edges): Make these VECs
diff --git a/gcc/common.opt b/gcc/common.opt
index 5739c1b8c2a..f39cde12ac1 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -407,11 +407,11 @@ Common Report Var(flag_gcse_lm) Init(1)
 Perform enhanced load motion during global common subexpression elimination
 
 fgcse-sm
-Common Report Var(flag_gcse_sm) Init(1)
+Common Report Var(flag_gcse_sm) Init(0)
 Perform store motion after global common subexpression elimination
 
 fgcse-las
-Common Report Var(flag_gcse_las) Init(1)
+Common Report Var(flag_gcse_las) Init(0)
 Perform redundant load after store elimination in global common subexpression
 elimination
 
@@ -936,7 +936,7 @@ Common Report Var(flag_value_profile_transformations)
 Use expression value profiles in optimizations
 
 fweb
-Common Report Var(flag_web) VarExists
+Common Report Var(flag_web) Init(0)
 Construct webs and split unrelated uses of single variable
 
 fwrapv
diff --git a/gcc/flags.h b/gcc/flags.h
index 78c6d5a8885..91e719a0807 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -240,8 +240,6 @@ extern enum graph_dump_types graph_dump_format;
    and to print them when we are done.  */
 extern int flag_detailed_statistics;
 
-extern int flag_web;
-
 /* Nonzero means that we defer emitting functions until they are actually
    used.  */
 extern int flag_remove_unreachable_functions;
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 848bfca570b..eaeeecaca4d 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -270,12 +270,6 @@ int flag_pcc_struct_return = DEFAULT_PCC_STRUCT_RETURN;
 
 int flag_complex_divide_method = 0;
 
-/* Nonzero means performs web construction pass.  When flag_web ==
-   AUTODETECT_FLAG_VAR_TRACKING it will be set according to optimize
-   and default_debug_hooks in process_options ().  */
-
-int flag_web = AUTODETECT_FLAG_VAR_TRACKING;
-
 /* Nonzero means that we don't want inlining by virtue of -fno-inline,
    not just because the tree inliner turned us off.  */
 
@@ -1827,7 +1821,7 @@ process_options (void)
 	   debug_type_names[write_symbols]);
 
   /* Now we know which debug output will be used so we can set
-     flag_var_tracking, flag_rename_registers and flag_web if the user has
+     flag_var_tracking, flag_rename_registers if the user has
      not specified them.  */
   if (debug_info_level < DINFO_LEVEL_NORMAL
       || debug_hooks->var_location == do_nothing_debug_hooks.var_location)
@@ -1848,10 +1842,6 @@ process_options (void)
     flag_rename_registers = default_debug_hooks->var_location
 	    		    != do_nothing_debug_hooks.var_location;
 
-  if (flag_web == AUTODETECT_FLAG_VAR_TRACKING)
-    flag_web = optimize >= 2 && (default_debug_hooks->var_location
-	    		         != do_nothing_debug_hooks.var_location);
-
   if (flag_var_tracking == AUTODETECT_FLAG_VAR_TRACKING)
     flag_var_tracking = optimize >= 1;