From 0641fa9781e8cd257e0113360bef387bcbfd4b96 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 1 Jun 2010 13:00:46 +0000 Subject: [PATCH] optabs.c (init_optabs): Guard all accesses to reinit. 2010-06-01 Richard Guenther * 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. From-SVN: r160102 --- gcc/ChangeLog | 7 +++++++ gcc/c-opts.c | 3 ++- gcc/ipa-pure-const.c | 3 ++- gcc/optabs.c | 4 ++++ gcc/opts.c | 3 ++- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a4bdbe748b..c738fb01279 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-06-01 Richard Guenther + + * 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 Matthew Gingell diff --git a/gcc/c-opts.c b/gcc/c-opts.c index b485c25afe3..08592f58e4b 100644 --- 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 3bea566b510..df2f8c85312 100644 --- 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 f753def97ba..52b4cb9fa85 100644 --- 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 c9255e0f0f9..8699ec33703 100644 --- 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: