Update to mono-2.8;
there might be some breakage but this is the good time to do the update
This commit is contained in:
parent
2a5c871339
commit
e653dbf40a
@ -1,15 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2010/10/01 05:23:52 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2010/10/15 16:21:07 robert Exp $
|
||||
|
||||
COMMENT= cross platform, open source .NET developement framework
|
||||
|
||||
DISTNAME= mono-2.6.7
|
||||
REVISION= 1
|
||||
DISTNAME= mono-2.8
|
||||
|
||||
CATEGORIES= lang devel
|
||||
|
||||
SHARED_LIBS += mono 1.0 # .0.0
|
||||
SHARED_LIBS += mono-profiler-cov 1.0 # .0.0
|
||||
SHARED_LIBS += mono-profiler-aot 1.0 # .0.0
|
||||
SHARED_LIBS += mono-2.0 1.0 # .0.0
|
||||
SHARED_LIBS += mono-profiler-iomap 0.0 # .0.0
|
||||
SHARED_LIBS += monosgen-2.0 0.0 # .0.0
|
||||
SHARED_LIBS += mono-profiler-aot 1.0 # .0.0
|
||||
SHARED_LIBS += mono-profiler-cov 1.0 # .0.0
|
||||
|
||||
HOMEPAGE= http://www.mono-project.com/
|
||||
|
||||
@ -21,14 +22,12 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
|
||||
WANTLIB= c glib-2.0 gmodule-2.0 gthread-2.0 \
|
||||
m pcre pthread z stdc++
|
||||
WANTLIB= c iconv m pthread z stdc++
|
||||
|
||||
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= devel/gettext \
|
||||
lang/mono
|
||||
MODULES= lang/mono
|
||||
|
||||
MODMONO_DEPS= No
|
||||
|
||||
@ -47,11 +46,9 @@ LIB_DEPENDS= gc::devel/boehm-gc
|
||||
AUTOCONF_VERSION=2.63
|
||||
CONFIGURE_STYLE=autoconf
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LC_ALL=C
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-gc=boehm \
|
||||
--with-glib=system \
|
||||
--enable-quiet-build=no \
|
||||
--disable-shared-handles
|
||||
|
||||
@ -79,6 +76,11 @@ BASH_SCRIPTS= mcs/class/Mono.WebBrowser/build-csproj2k5 \
|
||||
|
||||
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC}/eglib && \
|
||||
${_SYSTRACE_CMD} ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} && \
|
||||
${_SYSTRACE_CMD} ${SETENV} ${AUTOCONF_ENV} ${AUTOHEADER}
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/runtime/mono-wrapper.in \
|
||||
${WRKSRC}/runtime/monodis-wrapper.in
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (mono-2.6.7.tar.bz2) = zIt78GG9EfvQ/MHJXredNA==
|
||||
RMD160 (mono-2.6.7.tar.bz2) = WCWtKE5BI+TduJM2N6Pb9fV/f1o=
|
||||
SHA1 (mono-2.6.7.tar.bz2) = ZSjACdNEoh6wiYh2NpIip//3aDg=
|
||||
SHA256 (mono-2.6.7.tar.bz2) = riGpl9cuL7jqiGRMh6tSRx6clxF7k34gXqGDW1oCjOQ=
|
||||
SIZE (mono-2.6.7.tar.bz2) = 27921963
|
||||
MD5 (mono-2.8.tar.bz2) = MLEYDiDlEQ0/s2FHE3AUoA==
|
||||
RMD160 (mono-2.8.tar.bz2) = 4vePgSipTdmDs4CiQIx6ZI6OCGQ=
|
||||
SHA1 (mono-2.8.tar.bz2) = pyTeaNzLWDtU0uCMWh5XYMGCJas=
|
||||
SHA256 (mono-2.8.tar.bz2) = 6DSeyyPp+G8Oqa9B4xJdTC4ZCYVaanHuhLFWkF7fcRE=
|
||||
SIZE (mono-2.8.tar.bz2) = 31279224
|
||||
|
@ -1,31 +0,0 @@
|
||||
--- configure.in.orig Wed Jul 7 09:02:24 2010
|
||||
+++ configure.in Wed Aug 18 09:34:28 2010
|
||||
@@ -147,7 +147,7 @@ case "$host" in
|
||||
;;
|
||||
*-*-*openbsd*)
|
||||
platform_win32=no
|
||||
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
|
||||
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_REENTRANT -DUSE_MMAP"
|
||||
if test "x$disable_munmap" != "xyes"; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
|
||||
fi
|
||||
@@ -326,7 +326,7 @@ fi
|
||||
|
||||
AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
|
||||
|
||||
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h)
|
||||
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h)
|
||||
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h)
|
||||
|
||||
AC_CHECK_HEADERS(sys/user.h, [], [],
|
||||
@@ -1991,8 +1991,8 @@ JIT_SUPPORTED=no
|
||||
INTERP_SUPPORTED=no
|
||||
LIBC="libc.so.6"
|
||||
INTL="libc.so.6"
|
||||
-SQLITE="libsqlite.so.0"
|
||||
-SQLITE3="libsqlite3.so.0"
|
||||
+SQLITE="libsqlite.so"
|
||||
+SQLITE3="libsqlite3.so"
|
||||
X11="libX11.so"
|
||||
|
||||
sizeof_register="SIZEOF_VOID_P"
|
12
lang/mono/patches/patch-eglib_configure_ac
Normal file
12
lang/mono/patches/patch-eglib_configure_ac
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-eglib_configure_ac,v 1.1 2010/10/15 16:21:07 robert Exp $
|
||||
--- eglib/configure.ac.orig Thu Oct 14 21:41:01 2010
|
||||
+++ eglib/configure.ac Thu Oct 14 21:41:27 2010
|
||||
@@ -110,7 +110,7 @@ if test "x$have_iso_varargs" = "xyes"; then
|
||||
fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
-AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h)
|
||||
+AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h iconv.h localcharset.h)
|
||||
|
||||
if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
|
||||
GPOINTER_TO_INT="((gint)(long) (ptr))"
|
24
lang/mono/patches/patch-eglib_src_gunicode_c
Normal file
24
lang/mono/patches/patch-eglib_src_gunicode_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-eglib_src_gunicode_c,v 1.1 2010/10/15 16:21:07 robert Exp $
|
||||
--- eglib/src/gunicode.c.orig Thu Oct 14 21:42:12 2010
|
||||
+++ eglib/src/gunicode.c Thu Oct 14 21:43:17 2010
|
||||
@@ -53,6 +53,9 @@
|
||||
# ifdef HAVE_ICONV_H
|
||||
# include <iconv.h>
|
||||
# endif
|
||||
+# ifdef HAVE_LOCALCHARSET_H
|
||||
+# include <localcharset.h>
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
static char *my_charset;
|
||||
@@ -303,8 +306,8 @@ g_get_charset (G_CONST_RETURN char **charset)
|
||||
#else
|
||||
if (my_charset == NULL){
|
||||
/* These shouldn't be heap allocated */
|
||||
-#if HAVE_LANGINFO_H
|
||||
- my_charset = nl_langinfo (CODESET);
|
||||
+#if HAVE_LOCALCHARSET_H
|
||||
+ my_charset = locale_charset ();
|
||||
#else
|
||||
my_charset = "UTF-8";
|
||||
#endif
|
@ -1,9 +0,0 @@
|
||||
$OpenBSD: patch-mcs_tools_gensources_sh,v 1.1.1.1 2008/10/15 13:34:10 robert Exp $
|
||||
--- mcs/tools/gensources.sh.orig Thu Oct 9 15:18:49 2008
|
||||
+++ mcs/tools/gensources.sh Thu Oct 9 15:25:23 2008
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env bash
|
||||
+#!/bin/sh
|
||||
|
||||
includefile=$1
|
||||
excludefile=$2
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-mono_metadata_socket-io_c,v 1.4 2010/07/03 16:58:11 naddy Exp $
|
||||
--- mono/metadata/socket-io.c.orig Sat Jul 3 10:51:06 2010
|
||||
+++ mono/metadata/socket-io.c Sat Jul 3 10:51:52 2010
|
||||
@@ -1762,7 +1762,7 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOpti
|
||||
int time_ms = 0;
|
||||
socklen_t time_ms_size = sizeof (time_ms);
|
||||
#ifdef SO_PEERCRED
|
||||
- struct ucred cred;
|
||||
+ struct sockpeercred cred;
|
||||
socklen_t credsize = sizeof(cred);
|
||||
#endif
|
||||
MonoDomain *domain=mono_domain_get();
|
@ -1,40 +0,0 @@
|
||||
$OpenBSD: patch-mono_mini_exceptions-amd64_c,v 1.7 2010/08/23 13:18:50 robert Exp $
|
||||
--- mono/mini/exceptions-amd64.c.orig Mon Aug 23 10:08:49 2010
|
||||
+++ mono/mini/exceptions-amd64.c Mon Aug 23 11:10:09 2010
|
||||
@@ -723,28 +723,30 @@ gboolean
|
||||
mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
|
||||
{
|
||||
#if defined(MONO_ARCH_USE_SIGACTION)
|
||||
+ ucontext_t *ctx = (ucontext_t*)sigctx;
|
||||
+
|
||||
/*
|
||||
* Handling the exception in the signal handler is problematic, since the original
|
||||
* signal is disabled, and we could run arbitrary code though the debugger. So
|
||||
* resume into the normal stack and do most work there if possible.
|
||||
*/
|
||||
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
|
||||
- guint64 sp = UCONTEXT_REG_RSP (sigctx);
|
||||
+ guint64 sp = UCONTEXT_REG_RSP (ctx);
|
||||
|
||||
/* Pass the ctx parameter in TLS */
|
||||
- mono_arch_sigctx_to_monoctx (sigctx, &jit_tls->ex_ctx);
|
||||
+ mono_arch_sigctx_to_monoctx (ctx, &jit_tls->ex_ctx);
|
||||
/* The others in registers */
|
||||
- UCONTEXT_REG_RDI (sigctx) = (guint64)obj;
|
||||
- UCONTEXT_REG_RSI (sigctx) = test_only;
|
||||
+ UCONTEXT_REG_RDI (ctx) = (guint64)obj;
|
||||
+ UCONTEXT_REG_RSI (ctx) = test_only;
|
||||
|
||||
/* Allocate a stack frame below the red zone */
|
||||
sp -= 128;
|
||||
/* The stack should be unaligned */
|
||||
if (sp % 8 == 0)
|
||||
sp -= 8;
|
||||
- UCONTEXT_REG_RSP (sigctx) = sp;
|
||||
+ UCONTEXT_REG_RSP (ctx) = sp;
|
||||
|
||||
- UCONTEXT_REG_RIP (sigctx) = (guint64)handle_signal_exception;
|
||||
+ UCONTEXT_REG_RIP (ctx) = (guint64)handle_signal_exception;
|
||||
|
||||
return TRUE;
|
||||
#else
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-mono_mini_exceptions-ppc_c,v 1.2 2010/03/29 10:32:06 robert Exp $
|
||||
--- mono/mini/exceptions-ppc.c.orig Mon Mar 29 08:20:27 2010
|
||||
+++ mono/mini/exceptions-ppc.c Mon Mar 29 08:23:00 2010
|
||||
@@ -637,7 +637,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTl
|
||||
void
|
||||
mono_arch_sigctx_to_monoctx (void *ctx, MonoContext *mctx)
|
||||
{
|
||||
-#ifdef MONO_CROSS_COMPILE
|
||||
+#if defined(MONO_CROSS_COMPILE) || !defined(MONO_ARCH_USE_SIGACTION)
|
||||
g_assert_not_reached ();
|
||||
#else
|
||||
os_ucontext *uc = ctx;
|
||||
@@ -652,7 +652,7 @@ mono_arch_sigctx_to_monoctx (void *ctx, MonoContext *m
|
||||
void
|
||||
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *ctx)
|
||||
{
|
||||
-#ifdef MONO_CROSS_COMPILE
|
||||
+#if defined(MONO_CROSS_COMPILE) || !defined(MONO_ARCH_USE_SIGACTION)
|
||||
g_assert_not_reached ();
|
||||
#else
|
||||
os_ucontext *uc = ctx;
|
||||
@@ -667,7 +667,7 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *
|
||||
gpointer
|
||||
mono_arch_ip_from_context (void *sigctx)
|
||||
{
|
||||
-#ifdef MONO_CROSS_COMPILE
|
||||
+#if defined(MONO_CROSS_COMPILE) || !defined(MONO_ARCH_USE_SIGACTION)
|
||||
g_assert_not_reached ();
|
||||
#else
|
||||
os_ucontext *uc = sigctx;
|
@ -1,46 +0,0 @@
|
||||
$OpenBSD: patch-mono_mini_exceptions-x86_c,v 1.1 2010/08/23 13:18:50 robert Exp $
|
||||
--- mono/mini/exceptions-x86.c.orig Mon Aug 23 14:05:30 2010
|
||||
+++ mono/mini/exceptions-x86.c Mon Aug 23 14:06:27 2010
|
||||
@@ -1143,16 +1143,18 @@ gboolean
|
||||
mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
|
||||
{
|
||||
#if defined(MONO_ARCH_USE_SIGACTION)
|
||||
+ ucontext_t *ctx = (ucontext_t*)sigctx;
|
||||
+
|
||||
/*
|
||||
* Handling the exception in the signal handler is problematic, since the original
|
||||
* signal is disabled, and we could run arbitrary code though the debugger. So
|
||||
* resume into the normal stack and do most work there if possible.
|
||||
*/
|
||||
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
|
||||
- guint64 sp = UCONTEXT_REG_ESP (sigctx);
|
||||
+ guint64 sp = UCONTEXT_REG_ESP (ctx);
|
||||
|
||||
/* Pass the ctx parameter in TLS */
|
||||
- mono_arch_sigctx_to_monoctx (sigctx, &jit_tls->ex_ctx);
|
||||
+ mono_arch_sigctx_to_monoctx (ctx, &jit_tls->ex_ctx);
|
||||
/*
|
||||
* Can't pass the obj on the stack, since we are executing on the
|
||||
* same stack. Can't save it into MonoJitTlsData, since it needs GC tracking.
|
||||
@@ -1160,16 +1162,16 @@ mono_arch_handle_exception (void *sigctx, gpointer obj
|
||||
* pushes it.
|
||||
*/
|
||||
g_assert (!test_only);
|
||||
- UCONTEXT_REG_EAX (sigctx) = (gsize)obj;
|
||||
- UCONTEXT_REG_ECX (sigctx) = UCONTEXT_REG_EIP (sigctx);
|
||||
- UCONTEXT_REG_EDX (sigctx) = (gsize)handle_signal_exception;
|
||||
+ UCONTEXT_REG_EAX (ctx) = (gsize)obj;
|
||||
+ UCONTEXT_REG_ECX (ctx) = UCONTEXT_REG_EIP (ctx);
|
||||
+ UCONTEXT_REG_EDX (ctx) = (gsize)handle_signal_exception;
|
||||
|
||||
/* Allocate a stack frame, align it to 16 bytes which is needed on apple */
|
||||
sp -= 16;
|
||||
sp &= ~15;
|
||||
- UCONTEXT_REG_ESP (sigctx) = sp;
|
||||
+ UCONTEXT_REG_ESP (ctx) = sp;
|
||||
|
||||
- UCONTEXT_REG_EIP (sigctx) = (gsize)signal_exception_trampoline;
|
||||
+ UCONTEXT_REG_EIP (ctx) = (gsize)signal_exception_trampoline;
|
||||
|
||||
return TRUE;
|
||||
#elif defined (PLATFORM_WIN32)
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-mono_mini_main_c,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
|
||||
--- mono/mini/main.c.orig Sat Aug 15 03:03:10 2009
|
||||
+++ mono/mini/main.c Wed Sep 2 20:31:38 2009
|
||||
@@ -26,10 +26,14 @@ main ()
|
||||
$OpenBSD: patch-mono_mini_main_c,v 1.2 2010/10/15 16:21:07 robert Exp $
|
||||
--- mono/mini/main.c.orig Tue Oct 5 21:59:29 2010
|
||||
+++ mono/mini/main.c Wed Oct 13 18:35:09 2010
|
||||
@@ -88,10 +88,14 @@ main ()
|
||||
}
|
||||
|
||||
#else
|
||||
@ -15,5 +15,5 @@ $OpenBSD: patch-mono_mini_main_c,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
|
||||
+ sched_setaffinity(0, sizeof(mask), &mask);
|
||||
+#endif
|
||||
mono_build_date = build_date;
|
||||
return mono_main (argc, argv);
|
||||
}
|
||||
|
||||
return mono_main_with_options (argc, argv);
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-mono_mini_mini-ppc_h,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
|
||||
--- mono/mini/mini-ppc.h.orig Wed Sep 2 17:37:38 2009
|
||||
+++ mono/mini/mini-ppc.h Wed Sep 2 17:37:55 2009
|
||||
@@ -283,6 +283,8 @@ extern guint8* mono_ppc_create_pre_code_ftnptr (guint8
|
||||
#define MONO_ARCH_USE_SIGACTION 1
|
||||
#elif defined(__NetBSD__)
|
||||
#define MONO_ARCH_USE_SIGACTION 1
|
||||
+#elif defined(__OpenBSD__)
|
||||
+#undef MONO_ARCH_USE_SIGACTION
|
||||
#else
|
||||
/* For other operating systems, we pull the definition from an external file */
|
||||
#include "mini-ppc-os.h"
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-mono_tests_Makefile_in,v 1.2 2010/08/18 10:51:55 robert Exp $
|
||||
--- mono/tests/Makefile.in.orig Wed Jul 14 10:35:19 2010
|
||||
+++ mono/tests/Makefile.in Wed Aug 18 09:34:28 2010
|
||||
@@ -1280,7 +1280,7 @@ test-type-load: TestDriver.dll
|
||||
$OpenBSD: patch-mono_tests_Makefile_in,v 1.3 2010/10/15 16:21:07 robert Exp $
|
||||
--- mono/tests/Makefile.in.orig Tue Oct 5 22:00:38 2010
|
||||
+++ mono/tests/Makefile.in Wed Oct 13 18:35:13 2010
|
||||
@@ -1328,7 +1328,7 @@ test-type-load: TestDriver.dll
|
||||
@$(MCS) -r:TestDriver.dll -r:load-missing.dll -r:t.dll -out:load-exceptions.exe $(srcdir)/load-exceptions.cs
|
||||
@$(MCS) -t:library -out:t.dll $(srcdir)/t-missing.cs
|
||||
@echo "Testing load-exception.exe..."
|
||||
|
@ -1,9 +0,0 @@
|
||||
$OpenBSD: patch-mono_tests_make_imt_test_sh,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
|
||||
--- mono/tests/make_imt_test.sh.orig Tue Aug 4 08:03:26 2009
|
||||
+++ mono/tests/make_imt_test.sh Tue Sep 1 14:25:04 2009
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env sh
|
||||
+#!/bin/sh
|
||||
|
||||
LOW=2000
|
||||
HIGH=2000
|
69
lang/mono/patches/patch-mono_utils_mono-sigcontext_h
Normal file
69
lang/mono/patches/patch-mono_utils_mono-sigcontext_h
Normal file
@ -0,0 +1,69 @@
|
||||
$OpenBSD: patch-mono_utils_mono-sigcontext_h,v 1.6 2010/10/15 16:21:07 robert Exp $
|
||||
--- mono/utils/mono-sigcontext.h.orig Wed Oct 13 19:10:29 2010
|
||||
+++ mono/utils/mono-sigcontext.h Wed Oct 13 19:47:09 2010
|
||||
@@ -58,15 +58,15 @@
|
||||
#define UCONTEXT_REG_EDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_EDI])
|
||||
#define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_EIP])
|
||||
#elif defined(__OpenBSD__)
|
||||
- #define UCONTEXT_REG_EAX(ctx) ((ctx)->sc_eax)
|
||||
- #define UCONTEXT_REG_EBX(ctx) ((ctx)->sc_ebx)
|
||||
- #define UCONTEXT_REG_ECX(ctx) ((ctx)->sc_ecx)
|
||||
- #define UCONTEXT_REG_EDX(ctx) ((ctx)->sc_edx)
|
||||
- #define UCONTEXT_REG_EBP(ctx) ((ctx)->sc_ebp)
|
||||
- #define UCONTEXT_REG_ESP(ctx) ((ctx)->sc_esp)
|
||||
- #define UCONTEXT_REG_ESI(ctx) ((ctx)->sc_esi)
|
||||
- #define UCONTEXT_REG_EDI(ctx) ((ctx)->sc_edi)
|
||||
- #define UCONTEXT_REG_EIP(ctx) ((ctx)->sc_eip)
|
||||
+ #define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->sc_eax)
|
||||
+ #define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->sc_ebx)
|
||||
+ #define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->sc_ecx)
|
||||
+ #define UCONTEXT_REG_EDX(ctx) (((ucontext_t*)(ctx))->sc_edx)
|
||||
+ #define UCONTEXT_REG_EBP(ctx) (((ucontext_t*)(ctx))->sc_ebp)
|
||||
+ #define UCONTEXT_REG_ESP(ctx) (((ucontext_t*)(ctx))->sc_esp)
|
||||
+ #define UCONTEXT_REG_ESI(ctx) (((ucontext_t*)(ctx))->sc_esi)
|
||||
+ #define UCONTEXT_REG_EDI(ctx) (((ucontext_t*)(ctx))->sc_edi)
|
||||
+ #define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->sc_eip)
|
||||
#else
|
||||
#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.gregs [REG_EAX])
|
||||
#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.gregs [REG_EBX])
|
||||
@@ -103,23 +103,23 @@
|
||||
#define UCONTEXT_GREGS(ctx) ((guint64*)&(((ucontext_t*)(ctx))->uc_mcontext))
|
||||
#elif defined(__OpenBSD__)
|
||||
/* OpenBSD/amd64 has no gregs array, ucontext_t == sigcontext */
|
||||
- #define UCONTEXT_REG_RAX(ctx) ((ctx)->sc_rax)
|
||||
- #define UCONTEXT_REG_RBX(ctx) ((ctx)->sc_rbx)
|
||||
- #define UCONTEXT_REG_RCX(ctx) ((ctx)->sc_rcx)
|
||||
- #define UCONTEXT_REG_RDX(ctx) ((ctx)->sc_rdx)
|
||||
- #define UCONTEXT_REG_RBP(ctx) ((ctx)->sc_rbp)
|
||||
- #define UCONTEXT_REG_RSP(ctx) ((ctx)->sc_rsp)
|
||||
- #define UCONTEXT_REG_RSI(ctx) ((ctx)->sc_rsi)
|
||||
- #define UCONTEXT_REG_RDI(ctx) ((ctx)->sc_rdi)
|
||||
- #define UCONTEXT_REG_RIP(ctx) ((ctx)->sc_rip)
|
||||
- #define UCONTEXT_REG_R8(ctx) ((ctx)->sc_r8)
|
||||
- #define UCONTEXT_REG_R9(ctx) ((ctx)->sc_r9)
|
||||
- #define UCONTEXT_REG_R10(ctx) ((ctx)->sc_r10)
|
||||
- #define UCONTEXT_REG_R11(ctx) ((ctx)->sc_r11)
|
||||
- #define UCONTEXT_REG_R12(ctx) ((ctx)->sc_r12)
|
||||
- #define UCONTEXT_REG_R13(ctx) ((ctx)->sc_r13)
|
||||
- #define UCONTEXT_REG_R14(ctx) ((ctx)->sc_r14)
|
||||
- #define UCONTEXT_REG_R15(ctx) ((ctx)->sc_r15)
|
||||
+ #define UCONTEXT_REG_RAX(ctx) (((ucontext_t*)(ctx))->sc_rax)
|
||||
+ #define UCONTEXT_REG_RBX(ctx) (((ucontext_t*)(ctx))->sc_rbx)
|
||||
+ #define UCONTEXT_REG_RCX(ctx) (((ucontext_t*)(ctx))->sc_rcx)
|
||||
+ #define UCONTEXT_REG_RDX(ctx) (((ucontext_t*)(ctx))->sc_rdx)
|
||||
+ #define UCONTEXT_REG_RBP(ctx) (((ucontext_t*)(ctx))->sc_rbp)
|
||||
+ #define UCONTEXT_REG_RSP(ctx) (((ucontext_t*)(ctx))->sc_rsp)
|
||||
+ #define UCONTEXT_REG_RSI(ctx) (((ucontext_t*)(ctx))->sc_rsi)
|
||||
+ #define UCONTEXT_REG_RDI(ctx) (((ucontext_t*)(ctx))->sc_rdi)
|
||||
+ #define UCONTEXT_REG_RIP(ctx) (((ucontext_t*)(ctx))->sc_rip)
|
||||
+ #define UCONTEXT_REG_R8(ctx) (((ucontext_t*)(ctx))->sc_r8)
|
||||
+ #define UCONTEXT_REG_R9(ctx) (((ucontext_t*)(ctx))->sc_r9)
|
||||
+ #define UCONTEXT_REG_R10(ctx) (((ucontext_t*)(ctx))->sc_r10)
|
||||
+ #define UCONTEXT_REG_R11(ctx) (((ucontext_t*)(ctx))->sc_r11)
|
||||
+ #define UCONTEXT_REG_R12(ctx) (((ucontext_t*)(ctx))->sc_r12)
|
||||
+ #define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->sc_r13)
|
||||
+ #define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->sc_r14)
|
||||
+ #define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->sc_r15)
|
||||
#else
|
||||
#define UCONTEXT_GREGS(ctx) ((guint64*)&(((ucontext_t*)(ctx))->uc_mcontext.gregs))
|
||||
#endif
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-runtime_mono-wrapper_in,v 1.3 2010/09/28 18:33:06 jasper Exp $
|
||||
--- runtime/mono-wrapper.in.orig Fri Sep 25 16:58:09 2009
|
||||
+++ runtime/mono-wrapper.in Sat Mar 20 11:03:12 2010
|
||||
$OpenBSD: patch-runtime_mono-wrapper_in,v 1.4 2010/10/15 16:21:07 robert Exp $
|
||||
--- runtime/mono-wrapper.in.orig Tue Oct 5 21:59:29 2010
|
||||
+++ runtime/mono-wrapper.in Wed Oct 13 18:39:27 2010
|
||||
@@ -4,4 +4,4 @@ MONO_CFG_DIR='@mono_cfg_dir@'
|
||||
PATH="$r/runtime/_tmpinst/bin:$PATH"
|
||||
MONO_SHARED_DIR=$r/runtime
|
||||
|
@ -1,7 +1,9 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/10/15 13:34:12 robert Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2010/10/15 16:21:07 robert Exp $
|
||||
lib/libMonoPosixHelper.so
|
||||
lib/libMonoSupportW.so
|
||||
lib/libikvm-native.so
|
||||
@lib lib/libmono-2.0.so.${LIBmono-2.0_VERSION}
|
||||
@lib lib/libmono-profiler-aot.so.${LIBmono-profiler-aot_VERSION}
|
||||
@lib lib/libmono-profiler-cov.so.${LIBmono-profiler-cov_VERSION}
|
||||
@lib lib/libmono.so.${LIBmono_VERSION}
|
||||
@lib lib/libmono-profiler-iomap.so.${LIBmono-profiler-iomap_VERSION}
|
||||
@lib lib/libmonosgen-2.0.so.${LIBmonosgen-2.0_VERSION}
|
||||
|
1095
lang/mono/pkg/PLIST
1095
lang/mono/pkg/PLIST
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user