Re: Bootstrap failure on i686-apple-darwin9

[Jan Hubicka <hubicka at ucw dot cz>]

> At revision 134333, boostrap fails on i686-apple-darwin9 at stage 1
> with:
> 
> ...
> gcc -c  -g -fkeep-inline-functions -DIN_GCC   -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wmissing-format-attribute -fno-common  -DHAVE_CONFIG_H -I. -I. -I../../gcc-4.4-work/gcc -I../../gcc-4.4-work/gcc/. -I../../gcc-4.4-work/gcc/../include -I./../intl -I../../gcc-4.4-work/gcc/../libcpp/include -I/sw/include  -I../../gcc-4.4-work/gcc/../libdecnumber -I../../gcc-4.4-work/gcc/../libdecnumber/dpd -I../libdecnumber  ../../gcc-4.4-work/gcc/explow.c -o explow.o
> ../../gcc-4.4-work/gcc/except.c: In function 'dw2_size_of_call_site_table':
> ../../gcc-4.4-work/gcc/except.c:3382: error: 'struct eh_status' has no member named 'call_site_data_used'
> ../../gcc-4.4-work/gcc/except.c:3388: error: 'struct eh_status' has no member named 'call_site_data'
Hi,
this is mine, sorry for that.
Does this help?

Index: except.c
===================================================================
*** except.c	(revision 134328)
--- except.c	(working copy)
*************** set_nothrow_function_flags (void)
*** 2784,2790 ****
  	  }
        }
  
!   for (insn = current_function_epilogue_delay_list; insn;
         insn = XEXP (insn, 1))
      if (can_throw_external (insn))
        {
--- 2784,2790 ----
  	  }
        }
  
!   for (insn = crtl->epilogue_delay_list; insn;
         insn = XEXP (insn, 1))
      if (can_throw_external (insn))
        {
*************** push_sleb128 (varray_type *data_area, in
*** 3379,3391 ****
  static int
  dw2_size_of_call_site_table (void)
  {
!   int n = cfun->eh->call_site_data_used;
    int size = n * (4 + 4 + 4);
    int i;
  
    for (i = 0; i < n; ++i)
      {
!       struct call_site_record *cs = &cfun->eh->call_site_data[i];
        size += size_of_uleb128 (cs->action);
      }
  
--- 3379,3391 ----
  static int
  dw2_size_of_call_site_table (void)
  {
!   int n = VEC_length (call_site_record, crtl->eh.call_site_record);
    int size = n * (4 + 4 + 4);
    int i;
  
    for (i = 0; i < n; ++i)
      {
!       struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
        size += size_of_uleb128 (cs->action);
      }
  
*************** dw2_size_of_call_site_table (void)
*** 3395,3407 ****
  static int
  sjlj_size_of_call_site_table (void)
  {
!   int n = cfun->eh->call_site_data_used;
    int size = 0;
    int i;
  
    for (i = 0; i < n; ++i)
      {
!       struct call_site_record *cs = &cfun->eh->call_site_data[i];
        size += size_of_uleb128 (INTVAL (cs->landing_pad));
        size += size_of_uleb128 (cs->action);
      }
--- 3395,3407 ----
  static int
  sjlj_size_of_call_site_table (void)
  {
!   int n = VEC_length (call_site_record, crtl->eh.call_site_record);
    int size = 0;
    int i;
  
    for (i = 0; i < n; ++i)
      {
!       struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
        size += size_of_uleb128 (INTVAL (cs->landing_pad));
        size += size_of_uleb128 (cs->action);
      }