[PATCH] Fix bootstrap issues with C++

Richard Guenther rguenther@suse.de
Tue Jun 1 12:59:00 GMT 2010


At least some, remaining are PR44362 and PR42798.

Bootstrapped on x86_64-unknown-linux-gnu with C++ and C, applied
as obvious.

Richard.

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.

Index: optabs.c
===================================================================
*** optabs.c	(revision 160098)
--- optabs.c	(working copy)
*************** void
*** 6173,6179 ****
--- 6173,6181 ----
  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.  */
*************** init_optabs (void)
*** 6670,6676 ****
--- 6672,6680 ----
    /* 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
Index: ipa-pure-const.c
===================================================================
*** ipa-pure-const.c	(revision 160099)
--- ipa-pure-const.c	(working copy)
*************** propagate (void)
*** 1110,1116 ****
  		}
  	      pure_const_state = MAX (pure_const_state, MIN (edge_state,
  				      w_l->state_previously_known));
! 	      looping = MAX (looping, MIN (edge_looping, edge_state));
  	      if (pure_const_state == IPA_NEITHER)
  	        break;
  	    }
--- 1110,1117 ----
  		}
  	      pure_const_state = MAX (pure_const_state, MIN (edge_state,
  				      w_l->state_previously_known));
! 	      looping = MAX (looping, MIN (edge_looping,
! 					   w_l->looping_previously_known));
  	      if (pure_const_state == IPA_NEITHER)
  	        break;
  	    }
Index: opts.c
===================================================================
*** opts.c	(revision 160098)
--- opts.c	(working copy)
*************** common_handle_option (size_t scode, cons
*** 2182,2188 ****
        break;
  
      case OPT_pedantic_errors:
!       global_dc->pedantic_errors = flag_pedantic_errors = pedantic = 1;
        break;
  
      case OPT_fwhopr:
--- 2182,2189 ----
        break;
  
      case OPT_pedantic_errors:
!       flag_pedantic_errors = pedantic = 1;
!       global_dc->pedantic_errors = 1;
        break;
  
      case OPT_fwhopr:
Index: c-opts.c
===================================================================
*** c-opts.c	(revision 160098)
--- c-opts.c	(working copy)
*************** c_common_handle_option (size_t scode, co
*** 849,855 ****
        break;
  
      case OPT_fpermissive:
!       global_dc->permissive = flag_permissive = value;
        break;
  
      case OPT_fpreprocessed:
--- 849,856 ----
        break;
  
      case OPT_fpermissive:
!       flag_permissive = value;
!       global_dc->permissive = value;
        break;
  
      case OPT_fpreprocessed:



More information about the Gcc-patches mailing list