2010-06-01 Richard Guenther <rguenther@suse.de>

	* optabs.c (init_optabs): Guard all accesses to reinit.
	* ipa-pure-const.c (propagate): Fix another typo.
	* opts.c (common_handle_option): Split assignment to bool.
	* c-opts.c (c_common_handle_option): Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a4bdbe748b55218a8812b372c82c47477b0d680..c738fb0127918e316160b2efcfb973196e161043 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-01  Richard Guenther  <rguenther@suse.de>
+
+       * optabs.c (init_optabs): Guard all accesses to reinit.
+       * ipa-pure-const.c (propagate): Fix another typo.
+       * opts.c (common_handle_option): Split assignment to bool.
+       * c-opts.c (c_common_handle_option): Likewise.
+
 2010-06-01  Arnaud Charlet  <charlet@adacore.com>
             Matthew Gingell  <gingell@adacore.com>
 

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index b485c25afe3c5d69e5088d3b91bd086a8d74d123..08592f58e4b9e4c50503712c81685750b6369534 100644 (file)
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -849,7 +849,8 @@ c_common_handle_option (size_t scode, const char *arg, int value,
       break;
 
     case OPT_fpermissive:
-      global_dc->permissive = flag_permissive = value;
+      flag_permissive = value;
+      global_dc->permissive = value;
       break;
 
     case OPT_fpreprocessed:

diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 3bea566b51070b433ea03590fcfee888062e95f1..df2f8c85312d226bfa6d07f7d4074c2998849e99 100644 (file)
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -1110,7 +1110,8 @@ propagate (void)
                }
              pure_const_state = MAX (pure_const_state, MIN (edge_state,
                                      w_l->state_previously_known));
-             looping = MAX (looping, MIN (edge_looping, edge_state));
+             looping = MAX (looping, MIN (edge_looping,
+                                          w_l->looping_previously_known));
              if (pure_const_state == IPA_NEITHER)
                break;
            }

diff --git a/gcc/optabs.c b/gcc/optabs.c
index f753def97ba0b30f51a9144f37a9d9f50d42a650..52b4cb9fa858d1a940909d4a70aefeb4c7bb28a0 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -6173,7 +6173,9 @@ void
 init_optabs (void)
 {
   unsigned int i;
+#if GCC_VERSION >= 4000 && HAVE_DESIGNATED_INITIALIZERS
   static bool reinit;
+#endif
 
   libfunc_hash = htab_create_ggc (10, hash_libfunc, eq_libfunc, NULL);
   /* Start by initializing all tables to contain CODE_FOR_nothing.  */
@@ -6670,7 +6672,9 @@ init_optabs (void)
   /* Allow the target to add more libcalls or rename some, etc.  */
   targetm.init_libfuncs ();
 
+#if GCC_VERSION >= 4000 && HAVE_DESIGNATED_INITIALIZERS
   reinit = true;
+#endif
 }
 
 /* Print information about the current contents of the optabs on

diff --git a/gcc/opts.c b/gcc/opts.c
index c9255e0f0f9b52278dff9fddc7ece143a775201d..8699ec33703cd81e89d30d624b618bf2426e3505 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2182,7 +2182,8 @@ common_handle_option (size_t scode, const char *arg, int value,
       break;
 
     case OPT_pedantic_errors:
-      global_dc->pedantic_errors = flag_pedantic_errors = pedantic = 1;
+      flag_pedantic_errors = pedantic = 1;
+      global_dc->pedantic_errors = 1;
       break;
 
     case OPT_fwhopr: