Some fixes for DragonFly (not completed).

4 files changed, 38 insertions, 19 deletions

diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index cd428c166e2..d173cef4e3c 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,6 +1,23 @@
-$NetBSD: patch-ad,v 1.20 2010/12/01 16:49:13 kefren Exp $
---- mono/utils/mono-sigcontext.h.orig	2010-11-12 12:24:41.000000000 +0200
-+++ mono/utils/mono-sigcontext.h	2010-12-01 18:02:44.000000000 +0200
+$NetBSD: patch-ad,v 1.21 2010/12/29 05:41:20 obache Exp $
+--- mono/utils/mono-sigcontext.h.orig	2010-11-12 10:24:41.000000000 +0000
++++ mono/utils/mono-sigcontext.h
+@@ -8,14 +8,14 @@
+ 
+ #if defined(__i386__)
+ 
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #include <ucontext.h>
+ #endif
+ #if defined(__APPLE__)
+ #include <AvailabilityMacros.h>
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
+ 	#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ebx)
+ 	#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ecx)
 @@ -101,6 +101,20 @@
  	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15)
  #elif defined(__FreeBSD__)
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
index 0c54fbfbaab..481fa10091a 100644
--- a/lang/mono/patches/patch-ag
+++ b/lang/mono/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2010/10/16 04:32:18 kefren Exp $
+$NetBSD: patch-ag,v 1.9 2010/12/29 05:41:20 obache Exp $
 --- mono/metadata/threadpool.c.orig	2010-10-07 22:59:36.000000000 +0300
 +++ mono/metadata/threadpool.c	2010-10-07 23:00:03.000000000 +0300
 @@ -1898,7 +1898,7 @@ async_invoke_thread (gpointer data)
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.8 2010/10/16 04:32:18 kefren Exp $
  			TP_DEBUG ("Waiting");
  			InterlockedIncrement (&tp->waiting);
 -#if defined(__OpenBSD__)
-+#if (defined(__OpenBSD__) || defined(__NetBSD__))
++#if (defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  			while ((res = mono_sem_wait (&tp->new_job, TRUE)) == -1) {// && errno == EINTR) {
  #else
  			while ((res = mono_sem_timedwait (&tp->new_job, 2000, TRUE)) == -1) {// && errno == EINTR) {
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
index 2f2b36abbdb..a2866e83469 100644
--- a/lang/mono/patches/patch-ah
+++ b/lang/mono/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
+$NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
 --- mono/utils/mono-semaphore.c.orig	2010-10-07 23:41:21.000000000 +0300
 +++ mono/utils/mono-semaphore.c	2010-10-07 23:44:31.000000000 +0300
 @@ -22,7 +22,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  #    define TIMESPEC mach_timespec_t
  #    define WAIT_BLOCK(a,b) semaphore_timedwait (*(a), *(b))
 -#  elif defined(__OpenBSD__)
-+#  elif (defined(__OpenBSD__) || defined(__NetBSD__))
++#  elif (defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  #    define TIMESPEC struct timespec
  #    define WAIT_BLOCK(a) sem_trywait(a)
  #  else
@@ -14,7 +14,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  int
  mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
  {
-+#if (defined(__NetBSD__) || defined(__OpenBSD__))
++#if (defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 +	uint32_t timeout = timeout_ms;
 +#else
  	TIMESPEC ts, copy;
@@ -33,7 +33,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  	if (timeout_ms == (guint32) 0xFFFFFFFF)
  		return mono_sem_wait (sem, alertable);
  
-+#if (defined(__NetBSD__) || defined(__OpenBSD__))
++#if (defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 +	if (timeout < 50)
 +		timeout += 50;
 +	do {
diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db
index caf3bdba21c..4758ebf8aab 100644
--- a/lang/mono/patches/patch-db
+++ b/lang/mono/patches/patch-db
@@ -1,7 +1,7 @@
-$NetBSD: patch-db,v 1.3 2010/04/29 08:44:30 kefren Exp $
---- mono/utils/mono-proclib.c.orig	2010-04-22 18:37:45.000000000 +0300
-+++ mono/utils/mono-proclib.c	2010-04-29 09:47:24.000000000 +0300
-@@ -13,15 +13,20 @@
+$NetBSD: patch-db,v 1.4 2010/12/29 05:41:20 obache Exp $
+--- mono/utils/mono-proclib.c.orig	2010-11-12 10:24:41.000000000 +0000
++++ mono/utils/mono-proclib.c
+@@ -13,11 +13,13 @@
  #endif
  
  /* FIXME: bsds untested */
@@ -16,11 +16,13 @@ $NetBSD: patch-db,v 1.3 2010/04/29 08:44:30 kefren Exp $
  #ifdef HAVE_SYS_USER_H
  #include <sys/user.h>
  #endif
--#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC
-+#if !(defined(__NetBSD__) || defined(__DragonFly__))
+@@ -29,6 +31,9 @@
+ #    define kinfo_pid_member kp_proc.p_pid
+ #    define kinfo_name_member kp_proc.p_comm
+ #  endif
++#elif defined(__DragonFly__)
 +#define kinfo_pid_member kp_pid
 +#define kinfo_name_member kp_comm
-+#elif HAVE_STRUCT_KINFO_PROC_KP_PROC
- #  ifdef KERN_PROC2
- #    define kinfo_pid_member p_pid
- #    define kinfo_name_member p_comm
+ #else
+ #define kinfo_pid_member ki_pid
+ #define kinfo_name_member ki_comm