===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v
retrieving revision 1.13
retrieving revision 1.17
diff -u -p -r1.13 -r1.17
--- OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2017/08/30 09:40:30	1.13
+++ OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2020/11/02 14:13:42	1.17
@@ -199,35 +199,42 @@ 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
-@@ -22,13 +22,13 @@
- all: gctest.exe cord\de.exe test_cpp.exe
+@@ -3,7 +3,10 @@
  
- .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.
+ MY_CPU=AMD64
+ CPU=$(MY_CPU)
+-!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
  
- .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\gc_disclaim.h include\private\msvc_dbg.h
- 
+ # 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.
 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
-@@ -22,10 +22,10 @@
- all: gctest.exe cord\de.exe test_cpp.exe
+@@ -3,7 +3,10 @@
  
- .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
+ MY_CPU=X86
+ CPU=$(MY_CPU)
+-!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:
--	$(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
+ # 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.
+diff -urN gc-7.4.2.orig/include/private/gc_priv.h gc-7.4.2/include/private/gc_priv.h
+--- gc-7.4.2.orig/include/private/gc_priv.h	2014-06-03 15:08:02.000000000 +0900
++++ gc-7.4.2/include/private/gc_priv.h	2020-11-02 22:27:25.000000000 +0900
+@@ -1840,6 +1840,8 @@
+                                 /* free list nonempty, and return its   */
+                                 /* head.  Sz is in granules.            */
  
- $(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
- 
++void GC_timerstart(), GC_timerstop();
++
+ #ifdef GC_ADD_CALLER
+   /* GC_DBG_EXTRAS is used by GC debug API functions (unlike GC_EXTRAS  */
+   /* used by GC debug API macros) thus GC_RETURN_ADDR_PARENT (pointing  */