> > Does this help?
> 
> Thanks for tha answer, but now I have:
> 
> ...
> ../../gcc-4.4-work/gcc/except.c: In function 'set_nothrow_function_flags':
> ../../gcc-4.4-work/gcc/except.c:2787: error: 'struct rtl_data' has no member 
> named 'epilogue_delay_list'
> make[3]: *** [except.o] Error 1
> ...
Sorry, that hunk was left over of my other local changes I was testing.


Index: except.c
===================================================================
*** except.c    (revision 134328)
--- except.c    (working copy)
*************** 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);
      }

Reply via email to