version 1.12, 2015/08/25 07:46:41 |
version 1.16, 2018/09/13 19:20:47 |
Line 79 diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c |
|
Line 79 diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c |
|
+ needed_blocks; |
+ needed_blocks; |
if (blocks_to_get > MAXHINCR) { |
if (blocks_to_get > MAXHINCR) { |
word slop; |
word slop; |
@@ -1334,6 +1343,21 @@ |
|
GC_bool retry = FALSE; |
|
|
|
if (gran == 0) return(0); |
|
+#if defined(_MSC_VER) |
|
+ { |
|
+#include <signal.h> |
|
+ extern int recv_intr; |
|
+ if ( recv_intr ) { |
|
+ if ( recv_intr == 1 ) { |
|
+ recv_intr = 0; |
|
+ int_handler(); |
|
+ } else { |
|
+ recv_intr = 0; |
|
+ ox_usr1_handler(0); |
|
+ } |
|
+ } |
|
+ } |
|
+#endif |
|
|
|
while (*flh == 0) { |
|
ENTER_GC(); |
|
diff -urN gc-7.4.2.orig/misc.c gc-7.4.2/misc.c |
diff -urN gc-7.4.2.orig/misc.c gc-7.4.2/misc.c |
--- gc-7.4.2.orig/misc.c 2014-06-03 15:08:02.000000000 +0900 |
--- gc-7.4.2.orig/misc.c 2014-06-03 15:08:02.000000000 +0900 |
+++ gc-7.4.2/misc.c 2015-08-04 14:21:02.000000000 +0900 |
+++ gc-7.4.2/misc.c 2015-08-04 14:21:02.000000000 +0900 |
Line 221 diff -urN gc-7.4.2.orig/reclaim.c gc-7.4.2/reclaim.c |
|
Line 199 diff -urN gc-7.4.2.orig/reclaim.c gc-7.4.2/reclaim.c |
|
diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE |
diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE |
--- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900 |
--- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900 |
+++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE 2015-08-04 14:12:42.000000000 +0900 |
+++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE 2015-08-04 14:12:42.000000000 +0900 |
@@ -22,13 +22,13 @@ |
@@ -3,7 +3,10 @@ |
all: gctest.exe cord\de.exe test_cpp.exe |
|
|
|
.c.obj: |
MY_CPU=AMD64 |
- $(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 |
CPU=$(MY_CPU) |
+ $(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 |
-!include <ntwin32.mak> |
# Disable "may not be initialized" warnings. They're too approximate. |
+cc=cl |
# Disable crt security warnings, since unfortunately they warn about all sorts |
+cdebug=-Ox -DNDEBUG |
# of safe uses of strncpy. It would be nice to leave the rest enabled. |
+cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG |
|
+cvarsmt= -D_MT -MT |
|
|
.cpp.obj: |
# Make sure that .cc is not viewed as a suffix. It is for VC++2005, but |
- $(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 |
# not earlier versions. We can deal with either, but not inconsistency. |
+ $(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\gc_disclaim.h include\private\msvc_dbg.h |
|
|
|
diff -urN gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE |
diff -urN gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE |
--- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900 |
--- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900 |
+++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2015-08-04 14:12:42.000000000 +0900 |
+++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2015-08-04 14:12:42.000000000 +0900 |
@@ -22,10 +22,10 @@ |
@@ -3,7 +3,10 @@ |
all: gctest.exe cord\de.exe test_cpp.exe |
|
|
|
.c.obj: |
MY_CPU=X86 |
- $(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 |
CPU=$(MY_CPU) |
+ $(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 |
-!include <ntwin32.mak> |
|
+cc=cl |
|
+cdebug=-Ox -DNDEBUG |
|
+cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1 -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG |
|
+cvarsmt= -D_MT -MT |
|
|
.cpp.obj: |
# Make sure that .cc is not viewed as a suffix. It is for VC++2005, but |
- $(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 |
# not earlier versions. We can deal with either, but not inconsistency. |
+ $(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\gc_disclaim.h include\private\msvc_dbg.h |
|
|
|