Fix mingw compilation problems.

mono · Aug 8, 2013 · ebfd123 · ebfd123
1 parent 77f1faf
commit ebfd123
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
@@ -24,7 +24,13 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <winbase.h>
+/*
+ * The mingw version says:
+ * /usr/i686-pc-mingw32/sys-root/mingw/include/ws2tcpip.h:38:2: error: #error "ws2tcpip.h is not compatible with winsock.h. Include winsock2.h instead."
+ */
+#ifdef _MSC_VER
 #include <ws2tcpip.h>
+#endif
 #include <psapi.h>
 #include <shlobj.h>
 #include <mswsock.h>

diff --git a/mono/metadata/process.c b/mono/metadata/process.c
diff --git a/mono/metadata/sgen-os-win32.c b/mono/metadata/sgen-os-win32.c
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
@@ -814,10 +814,12 @@ mono_thread_create (MonoDomain *domain, gpointer func, gpointer arg)
 static __inline__ __attribute__((always_inline))
 /* This is not defined by gcc */
 unsigned long long
-__readfsdword (unsigned long long offset)
+__readfsdword (unsigned long offset)
 {
-	unsigned long long value;
-	__asm__("movl %%fs:%a[offset], %k[value]" : [value] "=q" (value) : [offset] "irm" (offset));
+	unsigned long value;
+	//	__asm__("movl %%fs:%a[offset], %k[value]" : [value] "=q" (value) : [offset] "irm" (offset));
+   __asm__ volatile ("movl    %%fs:%1,%0"
+     : "=r" (value) ,"=m" ((*(volatile long *) offset)));
 	return value;
 }
 #endif

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
@@ -117,6 +117,9 @@ noinst_SCRIPTS = mono
 mono: mono-$(mono_bin_suffix)
 	ln -sf $< $@
 
+mono.exe: mono-$(mono_bin_suffix).exe
+	ln -sf $< $@
+
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir) && ln -sf mono-$(mono_bin_suffix) mono)
 	(cd $(DESTDIR)$(libdir); for i in libmono$(libmono_suffix)*; do ln -sf $$i `echo $$i | sed s/$(libmono_suffix)//` ; done)
@@ -236,7 +239,7 @@ MONO_LIB=$(boehm_static_libraries)
 MONO_SGEN_LIB=$(sgen_static_libraries)
 else 
 MONO_LIB=libmonoboehm-2.0.la
-MONO_LIBLIB=libmonosgen-2.0.la
+MONO_SGEN_LIB=libmonosgen-2.0.la
 endif
 
 if LOADED_LLVM

diff --git a/mono/mini/mini-gc.c b/mono/mini/mini-gc.c
@@ -598,7 +598,11 @@ thread_suspend_func (gpointer user_data, void *sigctx, MonoContext *ctx)
 		gboolean res;
 
 		g_assert (tls->info);
+#ifdef TARGET_WIN32
+		return;
+#else
 		res = mono_thread_state_init_from_handle (&tls->unwind_state, (MonoNativeThreadId)tls->tid, tls->info->native_handle);
+#endif
 	} else {
 		tls->unwind_state.unwind_data [MONO_UNWIND_DATA_LMF] = mono_get_lmf ();
 		if (sigctx) {