This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

fix etext fallout


Fallout from Loren's patch.  We had two declarations for _end
that didn't match.


r~


        * os_dep.c (GC_init_linux_data_start): Fix references to
        __data_start and _end.

Index: boehm-gc/os_dep.c
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/os_dep.c,v
retrieving revision 1.23
diff -c -p -d -r1.23 os_dep.c
*** os_dep.c	2002/03/22 02:40:30	1.23
--- os_dep.c	2002/03/27 19:19:46
***************
*** 155,165 ****
  
  # ifdef LINUX
  #   pragma weak __data_start
!     extern int __data_start;
  #   pragma weak data_start
!     extern int data_start;
  # endif /* LINUX */
!   extern int _end;
  
    ptr_t GC_data_start;
  
--- 155,165 ----
  
  # ifdef LINUX
  #   pragma weak __data_start
!     extern int __data_start[];
  #   pragma weak data_start
!     extern int data_start[];
  # endif /* LINUX */
!   extern int _end[];
  
    ptr_t GC_data_start;
  
***************
*** 169,184 ****
  
  #   ifdef LINUX
        /* Try the easy approaches first:	*/
!       if (&__data_start != 0) {
! 	  GC_data_start = (ptr_t)(&__data_start);
  	  return;
        }
!       if (&data_start != 0) {
! 	  GC_data_start = (ptr_t)(&data_start);
  	  return;
        }
  #   endif /* LINUX */
!     GC_data_start = GC_find_limit((ptr_t)(&_end), FALSE);
    }
  #endif
  
--- 169,184 ----
  
  #   ifdef LINUX
        /* Try the easy approaches first:	*/
!       if (__data_start != 0) {
! 	  GC_data_start = (ptr_t)__data_start;
  	  return;
        }
!       if (data_start != 0) {
! 	  GC_data_start = (ptr_t)data_start;
  	  return;
        }
  #   endif /* LINUX */
!     GC_data_start = GC_find_limit((ptr_t)_end, FALSE);
    }
  #endif
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]