[Bsd-sharp-cvs] CVS commit to
/cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files by tmclau02
noreply at forge.novell.com
noreply at forge.novell.com
Sat Nov 19 18:26:24 MST 2005
CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files by tmclau02
Modified Files:
patch-mono_mini_exceptions-amd64.c
patch-mono_mini_mini-amd64.c patch-runtime_semdel-wrapper.in
Added Files:
patch-mono_mini_mini-exceptions.c patch-support_stdio.c
Log Message:
Update to latest SVN snapshot available, doesn't build, dies in C# land
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_mini-exceptions.c,v
rcsdiff: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_mini-exceptions.c,v: Symbolic name `NONE' is undefined.
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-support_stdio.c,v
rcsdiff: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-support_stdio.c,v: Symbolic name `NONE' is undefined.
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_exceptions-amd64.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_exceptions-amd64.c 2005/08/07 00:52:17 1.1
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_exceptions-amd64.c 2005/11/20 01:26:24 1.2
@@ -1,11 +1,8 @@
---- mono/mini/exceptions-amd64.c.orig Tue Aug 2 17:53:06 2005
-+++ mono/mini/exceptions-amd64.c Tue Aug 2 17:53:20 2005
-@@ -573,11 +573,27 @@
- * @obj: the exception object
- */
+--- mono/mini/exceptions-amd64.c.orig Sat Oct 29 15:34:30 2005
++++ mono/mini/exceptions-amd64.c Wed Nov 16 21:22:58 2005
+@@ -620,9 +620,25 @@
gboolean
--mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
-+mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
+ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
{
- ucontext_t *ctx = (ucontext_t*)sigctx;
- MonoContext mctx;
@@ -31,7 +28,7 @@
mctx.rax = ctx->uc_mcontext.gregs [REG_RAX];
mctx.rbx = ctx->uc_mcontext.gregs [REG_RBX];
mctx.rcx = ctx->uc_mcontext.gregs [REG_RCX];
-@@ -591,9 +607,25 @@
+@@ -636,9 +652,25 @@
mctx.r13 = ctx->uc_mcontext.gregs [REG_R13];
mctx.r14 = ctx->uc_mcontext.gregs [REG_R14];
mctx.r15 = ctx->uc_mcontext.gregs [REG_R15];
@@ -57,7 +54,7 @@
ctx->uc_mcontext.gregs [REG_RAX] = mctx.rax;
ctx->uc_mcontext.gregs [REG_RBX] = mctx.rbx;
ctx->uc_mcontext.gregs [REG_RCX] = mctx.rcx;
-@@ -607,14 +639,20 @@
+@@ -652,6 +684,7 @@
ctx->uc_mcontext.gregs [REG_R13] = mctx.r13;
ctx->uc_mcontext.gregs [REG_R14] = mctx.r14;
ctx->uc_mcontext.gregs [REG_R15] = mctx.r15;
@@ -65,10 +62,9 @@
return TRUE;
}
-
+@@ -659,7 +692,12 @@
gpointer
--mono_arch_ip_from_context (void *sigctx)
-+mono_arch_ip_from_context (void *sigctx)
+ mono_arch_ip_from_context (void *sigctx)
{
- ucontext_t *ctx = (ucontext_t*)sigctx;
- return (gpointer)ctx->uc_mcontext.gregs [REG_RIP];
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_mini-amd64.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_mini-amd64.c 2005/08/07 00:52:17 1.1
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-mono_mini_mini-amd64.c 2005/11/20 01:26:24 1.2
@@ -1,16 +1,14 @@
---- mono/mini/mini-amd64.c.orig Tue Aug 2 17:52:50 2005
-+++ mono/mini/mini-amd64.c Tue Aug 2 17:53:27 2005
-@@ -15,6 +15,9 @@
+--- mono/mini/mini-amd64.c.orig Sun Oct 30 14:33:12 2005
++++ mono/mini/mini-amd64.c Sun Nov 13 18:39:16 2005
+@@ -13,6 +13,7 @@
+ #include "mini.h"
+ #include <string.h>
#include <math.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/ucontext.h>
-+
-+#include <pthread_np.h>
++#include <ucontext.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
-@@ -55,6 +58,10 @@
+@@ -49,6 +49,10 @@
#define ARGS_OFFSET 16
#define GP_SCRATCH_REG AMD64_R11
@@ -21,7 +19,7 @@
/*
* AMD64 register usage:
* - callee saved registers are used for global register allocation
-@@ -5683,6 +5690,7 @@
+@@ -4639,6 +4643,7 @@
#define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
@@ -29,7 +27,7 @@
static int reg_to_ucontext_reg [] = {
REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,
REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15,
-@@ -5694,27 +5702,37 @@
+@@ -4650,27 +4655,37 @@
* integer overflow.
*/
gboolean
@@ -73,35 +71,11 @@
- if (ctx->uc_mcontext.gregs [reg_to_ucontext_reg [reg]] == -1)
+#if defined(__FreeBSD__)
+ if (gregs[reg_to_ucontext_reg[reg]] == -1)
- return TRUE;
++ return TRUE;
+#else
+ if (ctx->uc_mcontext.gregs [reg_to_ucontext_reg [reg]] == -1)
-+ return TRUE;
+ return TRUE;
+#endif
}
return FALSE;
-@@ -5888,10 +5906,10 @@
- #ifdef HAVE_PTHREAD_GETATTR_NP
- pthread_getattr_np( self, &attr );
- #else
-+ pthread_attr_init( &attr );
- #ifdef HAVE_PTHREAD_ATTR_GET_NP
- pthread_attr_get_np( self, &attr );
- #elif defined(sun)
-- pthread_attr_init( &attr );
- pthread_attr_getstacksize( &attr, &stsize );
- #else
- #error "Not implemented"
-@@ -5925,6 +5943,11 @@
- sa.ss_size = SIGNAL_STACK_SIZE;
- sa.ss_flags = SS_ONSTACK;
- sigaltstack (&sa, NULL);
-+
-+#if !defined(HAVE_PTHREAD_GETATTR_NP)
-+ pthread_attr_destroy(&attr);
-+#endif
-+
- }
-
- #endif
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-runtime_semdel-wrapper.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-runtime_semdel-wrapper.in 2005/09/05 20:33:13 1.1
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono-svn/files/patch-runtime_semdel-wrapper.in 2005/11/20 01:26:24 1.2
@@ -1,10 +1,9 @@
---- runtime/semdel-wrapper.in.orig Fri Aug 26 05:00:19 2005
-+++ runtime/semdel-wrapper.in Mon Sep 5 16:29:10 2005
-@@ -1,6 +1,6 @@
- #! /bin/sh
- r='@mono_build_root@'
- MONO_CFG_DIR='@mono_cfg_dir@'
--MONO_SHARED_DIR=$r/runtime
+--- runtime/semdel-wrapper.in.orig Sun Sep 4 18:19:00 2005
++++ runtime/semdel-wrapper.in Sun Sep 4 19:04:03 2005
+@@ -0,0 +1,6 @@
++#! /bin/sh
++r='@mono_build_root@'
++MONO_CFG_DIR='@mono_cfg_dir@'
+MONO_SHARED_DIR=${MONO_SHARED_DIR_PORT:="$r/runtime"}
- export MONO_CFG_DIR MONO_SHARED_DIR
- exec "$r/libtool" --mode=execute "$r/mono/handles/semdel" "$@"
++export MONO_CFG_DIR MONO_SHARED_DIR
++exec "$r/libtool" --mode=execute "$r/mono/handles/semdel" "$@"
More information about the Bsd-sharp-cvs
mailing list