[Pkg-mono-svn-commits] [SCM] mono branch, debian/patches/kfreebsd_support, updated. upstream/2.6.3-4-g80e52a9

[Jo Shields]

The following commit has been merged in the debian/patches/kfreebsd_support branch:
commit 80e52a962bc47f4249b2e08655665ac1e3899e5d
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jun 22 17:48:25 2010 +0100

    handle kfreebsd's differing use of context versus context.gregs via the upstream freebsd ifdef around a macro in mono/utils/mono-sigcontext.h, and not directly in mono/mini/exceptions-amd64.c

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 3dca193..983e7d2 100644
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -715,13 +715,7 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
 static inline guint64*
 gregs_from_ucontext (ucontext_t *ctx)
 {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    guint64 *gregs = (guint64 *) &ctx->uc_mcontext;
-#else
-    guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs;
-#endif
-
-	return gregs;
+	return (guint64 *) UCONTEXT_GREGS (ctx);
 }
 #endif
 void
diff --git a/mono/utils/mono-sigcontext.h b/mono/utils/mono-sigcontext.h
index 6dc89a4..a057620 100644
--- a/mono/utils/mono-sigcontext.h
+++ b/mono/utils/mono-sigcontext.h
@@ -68,7 +68,7 @@
 
 #elif defined(__x86_64__)
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext)
 #else
 #define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext.gregs)

-- 
mono