File mono-5.4.0.56-gc.patch of Package mingw64-mono

Overview Repositories Revisions Requests Users Attributes Meta

File mono-5.4.0.56-gc.patch of Package mingw64-mono (Revision eb3390d8d673a1b450bd617ca379dc6c)

Currently displaying revision eb3390d8d673a1b450bd617ca379dc6c , Show latest

--- mono-5.4.0.56/libgc/include/private/gcconfig.h	2017-07-28 11:53:59.864051901 +0200
+++ mono-5.4.0.56/libgc/include/private/gcconfig.h	2017-07-28 11:16:19.808939294 +0200
@@ -454,7 +454,7 @@
 #   define CYGWIN32
 #   define mach_type_known
 # endif
-# if defined(__MINGW32__) && !defined(mach_type_known)
+# if defined(__MINGW32__)
 #   define I386
 #   define MSWIN32
 #   define mach_type_known
--- mono-5.4.0.56/libgc/mark.c	2017-06-23 12:11:07.000000000 +0200
+++ mono-5.4.0.56/libgc/mark.c	2017-07-28 11:20:04.305411009 +0200
@@ -267,7 +267,7 @@
 /* register values.					*/
 /* We hold the allocation lock.  In the case of 	*/
 /* incremental collection, the world may not be stopped.*/
-#ifdef MSWIN32
+#if defined(MSWIN32) && !defined(X86_64)
   /* For win32, this is called after we establish a structured	*/
   /* exception handler, in case Windows unmaps one of our root	*/
   /* segments.  See below.  In either case, we acquire the 	*/
@@ -402,7 +402,7 @@
 }
 
 
-#ifdef MSWIN32
+#if defined(MSWIN32) && !defined(X86_64)
 
 # ifdef __GNUC__
 
@@ -522,7 +522,7 @@
 
       return ret_val;
   }
-#endif /* MSWIN32 */
+#endif /* MSWIN32 && !X86_64 */
 
 
 GC_bool GC_mark_stack_empty()
--- mono-5.4.0.56/libgc/win32_threads.c	2017-06-23 12:11:07.000000000 +0200
+++ mono-5.4.0.56/libgc/win32_threads.c	2017-07-28 11:26:13.437451269 +0200
@@ -403,7 +403,7 @@
 #       define PUSH1(reg) GC_push_one((word)context.reg)
 #       define PUSH2(r1,r2) PUSH1(r1), PUSH1(r2)
 #       define PUSH4(r1,r2,r3,r4) PUSH2(r1,r2), PUSH2(r3,r4)
-#       if defined(I386)
+#       if defined(I386) && !defined(X86_64)
           PUSH4(Edi,Esi,Ebx,Edx), PUSH2(Ecx,Eax), PUSH1(Ebp);
 	  sp = (ptr_t)context.Esp;
 #	elif defined(X86_64)

Places

File mono-5.4.0.56-gc.patch of Package mingw64-mono (Revision eb3390d8d673a1b450bd617ca379dc6c)

Places