Return to gc-7.4.2-risa.diff CVS log

Up to [local] / OpenXM_contrib2 / asir2018

Annotation of OpenXM_contrib2/asir2018/gc-7.4.2-risa.diff, Revision 1.2

1.1       noro        1: diff -urN gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE
                      2: --- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE   2014-06-03 15:08:01.000000000 +0900
1.2     ! ohara       3: +++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE        2019-03-27 16:28:15.790694000 +0900
        !             4: @@ -3,7 +3,11 @@
1.1       noro        5:
                      6:  MY_CPU=X86
                      7:  CPU=$(MY_CPU)
                      8: -!include <ntwin32.mak>
                      9: +#!include <ntwin32.mak>
1.2     ! ohara      10: +cc=cl
        !            11: +cdebug=-Ox -DNDEBUG
        !            12: +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1  -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG
        !            13: +cvarsmt= -D_MT -MT
1.1       noro       14:
                     15:  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
                     16:  # not earlier versions.  We can deal with either, but not inconsistency.
                     17: diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE
                     18: --- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE       2014-06-03 15:08:01.000000000 +0900
1.2     ! ohara      19: +++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE    2019-03-27 16:27:53.507090000 +0900
        !            20: @@ -3,7 +3,11 @@
1.1       noro       21:
                     22:  MY_CPU=AMD64
                     23:  CPU=$(MY_CPU)
                     24: -!include <ntwin32.mak>
                     25: +#!include <ntwin32.mak>
1.2     ! ohara      26: +cc=cl
        !            27: +cdebug=-Ox -DNDEBUG
        !            28: +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64  -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG
        !            29: +cvarsmt= -D_MT -MT
1.1       noro       30:
                     31:  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
                     32:  # not earlier versions.  We can deal with either, but not inconsistency.
                     33: diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
                     34: --- gc-7.4.2.orig/alloc.c      2014-06-03 15:08:01.000000000 +0900
                     35: +++ gc-7.4.2/alloc.c   2018-09-27 10:56:21.578349458 +0900
                     36: @@ -121,6 +121,7 @@
                     37:  #endif
                     38:
                     39:  word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR;
                     40: +word GC_free_space_numerator = 1;
                     41:
                     42:  GC_INNER int GC_CALLBACK GC_never_stop_func(void)
                     43:  {
                     44: @@ -227,8 +228,8 @@
                     45:      total_root_size = 2 * stack_size + GC_root_size;
                     46:      scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
                     47:                  + total_root_size;
                     48: -    result = scan_size / GC_free_space_divisor;
                     49: -    if (GC_incremental) {
                     50: +    result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
                     51: +    if (1 || GC_incremental) {
                     52:        result /= 2;
                     53:      }
                     54:      return result > 0 ? result : 1;
                     55: @@ -1215,6 +1216,9 @@
                     56:      if (GC_on_heap_resize)
                     57:        (*GC_on_heap_resize)(GC_heapsize);
                     58:
                     59: +#if defined(VISUAL)
                     60: +    SendHeapSize();
                     61: +#endif
                     62:      return(TRUE);
                     63:  }
                     64:
                     65: @@ -1276,7 +1280,7 @@
                     66:        }
                     67:      }
                     68:
                     69: -    blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
                     70: +    blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor)
                     71:                          + needed_blocks;
                     72:      if (blocks_to_get > MAXHINCR) {
                     73:        word slop;
                     74: diff -urN gc-7.4.2.orig/include/private/gcconfig.h gc-7.4.2/include/private/gcconfig.h
                     75: --- gc-7.4.2.orig/include/private/gcconfig.h   2014-06-03 15:08:02.000000000 +0900
                     76: +++ gc-7.4.2/include/private/gcconfig.h        2018-09-27 10:51:50.388875287 +0900
                     77: @@ -2622,6 +2622,7 @@
                     78:  #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
                     79:                               || defined(OPENBSD) || defined(ARM32) \
                     80:                               || defined(MIPS) || defined(AVR32))) \
                     81: +     || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
                     82:       || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
                     83:       || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \
                     84:      && !defined(NO_GETCONTEXT)