Annotation of OpenXM_contrib2/asir2018/gc-7.4.2-risa.diff, Revision 1.1
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
! 3: +++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2018-09-27 10:51:50.368874890 +0900
! 4: @@ -3,7 +3,7 @@
! 5:
! 6: MY_CPU=X86
! 7: CPU=$(MY_CPU)
! 8: -!include <ntwin32.mak>
! 9: +#!include <ntwin32.mak>
! 10:
! 11: # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but
! 12: # not earlier versions. We can deal with either, but not inconsistency.
! 13: @@ -22,10 +22,10 @@
! 14: all: gctest.exe cord\de.exe test_cpp.exe
! 15:
! 16: .c.obj:
! 17: - $(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
! 18: + $(CC) -c $(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
! 19:
! 20: .cpp.obj:
! 21: - $(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
! 22: + $(CC) -c $(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
! 23:
! 24: $(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\gc_disclaim.h include\private\msvc_dbg.h
! 25:
! 26: diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE
! 27: --- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900
! 28: +++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE 2018-09-27 10:51:50.368874890 +0900
! 29: @@ -3,7 +3,7 @@
! 30:
! 31: MY_CPU=AMD64
! 32: CPU=$(MY_CPU)
! 33: -!include <ntwin32.mak>
! 34: +#!include <ntwin32.mak>
! 35:
! 36: # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but
! 37: # not earlier versions. We can deal with either, but not inconsistency.
! 38: @@ -22,13 +22,13 @@
! 39: all: gctest.exe cord\de.exe test_cpp.exe
! 40:
! 41: .c.obj:
! 42: - $(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
! 43: + $(CC) -c $(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
! 44: # Disable "may not be initialized" warnings. They're too approximate.
! 45: # Disable crt security warnings, since unfortunately they warn about all sorts
! 46: # of safe uses of strncpy. It would be nice to leave the rest enabled.
! 47:
! 48: .cpp.obj:
! 49: - $(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
! 50: + $(CC) -c $(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
! 51:
! 52: $(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\gc_disclaim.h include\private\msvc_dbg.h
! 53:
! 54: diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
! 55: --- gc-7.4.2.orig/alloc.c 2014-06-03 15:08:01.000000000 +0900
! 56: +++ gc-7.4.2/alloc.c 2018-09-27 10:56:21.578349458 +0900
! 57: @@ -121,6 +121,7 @@
! 58: #endif
! 59:
! 60: word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR;
! 61: +word GC_free_space_numerator = 1;
! 62:
! 63: GC_INNER int GC_CALLBACK GC_never_stop_func(void)
! 64: {
! 65: @@ -227,8 +228,8 @@
! 66: total_root_size = 2 * stack_size + GC_root_size;
! 67: scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
! 68: + total_root_size;
! 69: - result = scan_size / GC_free_space_divisor;
! 70: - if (GC_incremental) {
! 71: + result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
! 72: + if (1 || GC_incremental) {
! 73: result /= 2;
! 74: }
! 75: return result > 0 ? result : 1;
! 76: @@ -1215,6 +1216,9 @@
! 77: if (GC_on_heap_resize)
! 78: (*GC_on_heap_resize)(GC_heapsize);
! 79:
! 80: +#if defined(VISUAL)
! 81: + SendHeapSize();
! 82: +#endif
! 83: return(TRUE);
! 84: }
! 85:
! 86: @@ -1276,7 +1280,7 @@
! 87: }
! 88: }
! 89:
! 90: - blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
! 91: + blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor)
! 92: + needed_blocks;
! 93: if (blocks_to_get > MAXHINCR) {
! 94: word slop;
! 95: diff -urN gc-7.4.2.orig/include/private/gcconfig.h gc-7.4.2/include/private/gcconfig.h
! 96: --- gc-7.4.2.orig/include/private/gcconfig.h 2014-06-03 15:08:02.000000000 +0900
! 97: +++ gc-7.4.2/include/private/gcconfig.h 2018-09-27 10:51:50.388875287 +0900
! 98: @@ -2622,6 +2622,7 @@
! 99: #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
! 100: || defined(OPENBSD) || defined(ARM32) \
! 101: || defined(MIPS) || defined(AVR32))) \
! 102: + || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
! 103: || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
! 104: || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \
! 105: && !defined(NO_GETCONTEXT)
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to gc-7.4.2-risa.diff CVS log ![[TXT]](/icons/cvsweb/text.gif){kind=icon}
![[DIR]](/icons/cvsweb/dir.gif){kind=icon}
Up to [local] / OpenXM_contrib2 / asir2018