===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2018/09/06 06:20:08	1.15
+++ OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2018/09/13 19:20:47	1.16
@@ -199,53 +199,30 @@ 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
 --- 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
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,10 @@
  
  MY_CPU=AMD64
  CPU=$(MY_CPU)
 -!include <ntwin32.mak>
-+#!include <ntwin32.mak>
++cc=cl
++cdebug=-Ox -DNDEBUG
++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
  
  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
  # not earlier versions.  We can deal with either, but not inconsistency.
-@@ -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) -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
- # 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) -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
- 
- $(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
 --- 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
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,10 @@
  
  MY_CPU=X86
  CPU=$(MY_CPU)
 -!include <ntwin32.mak>
-+#!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
  
  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
  # not earlier versions.  We can deal with either, but not inconsistency.
-@@ -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) -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
- 
- .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) -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
- 
- $(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
-