[BACK]Return to gc-7.0-risa.diff CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000

Diff for /OpenXM_contrib2/asir2000/gc-7.0-risa.diff between version 1.7 and 1.10

version 1.7, 2012/05/09 06:17:13 version 1.10, 2013/08/28 06:14:44
Line 32  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
Line 32  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
 @@ -629,6 +631,7 @@  @@ -629,6 +631,7 @@
                GC_world_stopped = FALSE;                 GC_world_stopped = FALSE;
  #           endif   #           endif
                     START_WORLD();               START_WORLD();
 +                               GC_timerstop();  +            GC_timerstop();
                     return(FALSE);               return(FALSE);
             }             }
             if (GC_mark_some((ptr_t)(&dummy))) break;             if (GC_mark_some((ptr_t)(&dummy))) break;
 @@ -651,6 +654,7 @@  @@ -651,6 +654,7 @@
        GC_world_stopped = FALSE;         GC_world_stopped = FALSE;
  #   endif   #   endif
Line 209  diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/rec
Line 209  diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/rec
        if (GC_print_stats == VERBOSE) {         if (GC_print_stats == VERBOSE) {
          GET_TIME(done_time);           GET_TIME(done_time);
          GC_log_printf("Disposing of reclaim lists took %lu msecs\n",           GC_log_printf("Disposing of reclaim lists took %lu msecs\n",
   diff -urN gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE
   --- gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE  2012-05-12 02:09:00.000000000 +0900
   +++ gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE       2013-06-13 14:43:07.000000000 +0900
   @@ -22,13 +22,13 @@
    all: gctest.exe cord\de.exe test_cpp.exe
   
    .c.obj:
   -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701
   +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj /wd4701
    # Disable "may not be initialized" warnings.  They're too approximate.
    # Disable crt security warnings, since unfortunately they warn about all sorts
    # of safe uses of strncpy.  It would be nice to leave the rest enabled.
   
    .cpp.obj:
   -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj
   +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj
   
    $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h
   
   diff -urN gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.2/NT_STATIC_THREADS_MAKEFILE
   --- gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE      2012-05-12 02:09:00.000000000 +0900
   +++ gc-7.2/NT_STATIC_THREADS_MAKEFILE   2013-06-13 17:07:36.000000000 +0900
   @@ -22,10 +22,10 @@
    all: gctest.exe cord\de.exe test_cpp.exe
   
    .c.obj:
   -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj
   +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj
   
    .cpp.obj:
   -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj
   +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj
   
    $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h
   
   
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.10
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>