[Bsd-sharp-cvs] CVS commit to
/cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files by killfill
noreply at forge.novell.com
noreply at forge.novell.com
Sat Oct 7 18:17:29 MDT 2006
CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files by killfill
Added Files:
extra-patch-support_mph.h patch-ikvm-native_jni.c
patch-libgc_dbg_mlc.c patch-libgc_include_private_gcconfig.h
patch-libgc_pthread_support.c
patch-mcs_tools_mkbundle_mkbundle.cs
patch-mono_metadata_assembly.c
patch-mono_metadata_filewatcher.c
patch-mono_metadata_socket-io.c
patch-mono_mini_exceptions-amd64.c
patch-mono_mini_mini-amd64.c patch-mono_mini_mini-amd64.h
patch-mono_mini_mini-exceptions.c
patch-mono_mini_tramp-amd64.c patch-mono_utils_mono-codeman.c
patch-os_dep.c patch-support_stdio.c
Log Message:
Merge from mono-devel:
- Semaphores handling is now integrated in mono (--wapi)
- Support for AMD64 (thanks Zoltan!)
- Remove X11R6 stuff
- Update to 1.1.17.2
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/extra-patch-support_mph.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-ikvm-native_jni.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_dbg_mlc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_include_private_gcconfig.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_include_private_gcconfig.h 2006/10/07 18:16:34 1.15
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_include_private_gcconfig.h 2006/10/08 00:17:29 1.16
@@ -1,47 +1,36 @@
---- libgc/include/private/gcconfig.h.orig Tue Aug 2 17:51:19 2005
-+++ libgc/include/private/gcconfig.h Wed Aug 3 02:05:34 2005
-@@ -306,6 +306,10 @@
+--- libgc/include/private/gcconfig.h.orig Wed Jul 5 17:55:42 2006
++++ libgc/include/private/gcconfig.h Sun Sep 10 10:36:31 2006
+@@ -347,6 +347,10 @@
# define I386
# define mach_type_known
# endif
+# if defined(FREEBSD) && defined(__x86_64__)
-+# define X86_64
-+# define mach_type_known
++# define X86_64
++# define mach_type_known
+# endif
# if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
# define I386
# define mach_type_known
-@@ -1859,6 +1863,33 @@
+@@ -1988,6 +1992,22 @@
+ # define PREFETCH(x) __builtin_prefetch((x), 0, 0)
# define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
# endif
- # endif
-+
++# endif
+# ifdef FREEBSD
-+# define OS_TYPE "FREEBSD"
-+# ifndef GC_FREEBSD_THREADS
-+# define MPROTECT_VDB
-+# endif
-+# define SIG_SUSPEND SIGTSTP
-+# define SIG_THR_RESTART SIGCONT
-+# define FREEBSD_STACKBOTTOM
-+# ifdef __ELF__
-+# define DYNAMIC_LOADING
-+# endif
++# define OS_TYPE "FREEBSD"
++# ifndef GC_FREEBSD_THREADS
++# define MPROTECT_VDB
++# endif
++# define SIG_SUSPEND SIGTSTP
++# define SIG_THR_RESTART SIGCONT
++# define FREEBSD_STACKBOTTOM
++# define NEED_FIND_LIMIT
++# ifdef __ELF__
++# define DYNAMIC_LOADING
++# endif
+ extern char etext[];
-+// extern char * GC_FreeBSDGetDataStart();
++ extern char * GC_FreeBSDGetDataStart();
+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-+
-+//# define HEURISTIC2
-+ extern char etext[];
-+//# define SEARCH_FOR_DATA_START
-+
-+/*
-+ extern char etext[];
-+ extern char * GC_FreeBSDGetDataStart();
-+# define DATASTART GC_FreeBSDGetDataStart(0x1000, &etext)
-+*/
-+# endif
-+
+ # endif
# ifdef NETBSD
# define OS_TYPE "NETBSD"
- # ifdef __ELF__
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_pthread_support.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_pthread_support.c 2006/10/07 18:16:34 1.13
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-libgc_pthread_support.c 2006/10/08 00:17:29 1.14
@@ -1,13 +1,9 @@
---- libgc/pthread_support.c.orig Tue Jun 21 12:52:42 2005
-+++ libgc/pthread_support.c Tue Jun 21 12:54:17 2005
-@@ -556,27 +556,6 @@
-
- volatile GC_thread GC_threads[THREAD_TABLE_SZ];
-
--/*
-- * gcc-3.3.6 miscompiles the &GC_thread_key+sizeof(&GC_thread_key) expression so
-- * put it into a separate function.
-- */
+--- libgc/pthread_support.c.orig Mon Sep 11 02:58:08 2006
++++ libgc/pthread_support.c Mon Sep 11 02:59:51 2006
+@@ -597,23 +597,6 @@
+ * gcc-3.3.6 miscompiles the &GC_thread_key+sizeof(&GC_thread_key) expression so
+ * put it into a separate function.
+ */
-# if defined(__GNUC__) && defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
-static __attribute__((noinline)) unsigned char* get_gc_thread_key_addr GC_PROTO((void))
-{
@@ -28,12 +24,13 @@
void GC_push_thread_structures GC_PROTO((void))
{
GC_push_all((ptr_t)(GC_threads), (ptr_t)(GC_threads)+sizeof(GC_threads));
-@@ -585,8 +564,6 @@
+@@ -622,9 +605,6 @@
(ptr_t)(&GC_thread_key)+sizeof(&GC_thread_key));
# endif
}
-
-#endif
-
+-
#ifdef THREAD_LOCAL_ALLOC
/* We must explicitly mark ptrfree and gcj free lists, since the free */
+ /* list links wouldn't otherwise be found. We also set them in the */
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs 2006/10/07 18:16:34 1.4
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mcs_tools_mkbundle_mkbundle.cs 2006/10/08 00:17:29 1.5
@@ -1,11 +1,11 @@
---- mcs/tools/mkbundle/mkbundle.cs.orig Mon Mar 13 17:58:04 2006
-+++ mcs/tools/mkbundle/mkbundle.cs Mon Apr 17 23:02:10 2006
-@@ -337,7 +337,7 @@
+--- mcs/tools/mkbundle/mkbundle.cs.orig Wed Jul 5 17:57:12 2006
++++ mcs/tools/mkbundle/mkbundle.cs Sat Sep 9 11:46:36 2006
+@@ -354,7 +354,7 @@
smonolib = "`pkg-config --variable=libdir mono`/libmono.a ";
else
smonolib = "-Wl,-Bstatic -lmono -Wl,-Bdynamic ";
-- cmd = String.Format ("cc -o {2} -Wall `pkg-config --cflags mono` {0} {3}" +
-+ cmd = String.Format ("%%CC%% -o {2} %%PTHREAD_LIBS%% -Wall `pkg-config --cflags mono` {0} {3}" +
+- cmd = String.Format ("{4} -o {2} -Wall `pkg-config --cflags mono` {0} {3} " +
++ cmd = String.Format ("{4} -o {2} -pthread -Wall `pkg-config --cflags mono` {0} {3} " +
"`pkg-config --libs-only-L mono` " + smonolib +
"`pkg-config --libs-only-l mono | sed -e \"s/\\-lmono //\"` {1}",
- temp_c, temp_o, output, zlib);
+ temp_c, temp_o, output, zlib, cc);
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_assembly.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_assembly.c 2006/10/07 18:16:34 1.17
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_assembly.c 2006/10/08 00:17:29 1.18
@@ -5,7 +5,7 @@
char **splitted;
- path = g_getenv ("MONO_GAC_PREFIX");
-+ path = g_strjoin(G_SEARCHPATH_SEPARATOR_S, "%%X11BASE%%", g_getenv("MONO_GAC_PREFIX"), NULL);
++ path = g_strjoin(G_SEARCHPATH_SEPARATOR_S, "%%LOCALBASE%%", g_getenv("MONO_GAC_PREFIX"), NULL);
+
if (!path)
return;
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_filewatcher.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_socket-io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_socket-io.c 2006/10/07 18:16:34 1.13
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_metadata_socket-io.c 2006/10/08 00:17:29 1.14
@@ -1,11 +1,11 @@
---- mono/metadata/socket-io.c.orig Thu Jun 16 21:01:26 2005
-+++ mono/metadata/socket-io.c Thu Jun 16 21:04:19 2005
-@@ -2496,7 +2496,7 @@
+--- mono/metadata/socket-io.c.orig Mon Sep 11 03:06:28 2006
++++ mono/metadata/socket-io.c Mon Sep 11 03:06:44 2006
+@@ -2610,7 +2610,7 @@
struct sockaddr_in6 saddr6;
struct addrinfo *info = NULL, hints;
gint32 family;
- char hostname[1024] = {0};
-+ char hostname[NI_MAXHOST];
++ char hostname[NI_MAXHOST] = {0};
#else
struct in_addr inaddr;
struct hostent *he;
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_exceptions-amd64.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.c 2006/10/07 18:16:34 1.11
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.c 2006/10/08 00:17:29 1.12
@@ -1,5 +1,5 @@
---- mono/mini/mini-amd64.c.orig Mon Mar 13 17:57:59 2006
-+++ mono/mini/mini-amd64.c Tue Apr 4 21:21:37 2006
+--- mono/mini/mini-amd64.c.orig Fri Aug 25 15:35:16 2006
++++ mono/mini/mini-amd64.c Sun Sep 17 16:50:59 2006
@@ -14,6 +14,7 @@
#include <string.h>
#include <math.h>
@@ -19,7 +19,31 @@
/*
* AMD64 register usage:
* - callee saved registers are used for global register allocation
-@@ -4717,6 +4722,7 @@
+@@ -1514,6 +1519,10 @@
+ if (cfg->compile_aot)
+ near_call = TRUE;
+
++#ifdef MONO_AMD64_NO_MAP32BIT
++ near_call = FALSE;
++#endif
++
+ if (near_call) {
+ amd64_call_code (code, 0);
+ }
+@@ -3954,12 +3963,6 @@
+ switch (patch_info->type) {
+ case MONO_PATCH_INFO_NONE:
+ continue;
+- case MONO_PATCH_INFO_CLASS_INIT: {
+- /* Might already been changed to a nop */
+- guint8* ip2 = ip;
+- amd64_call_code (ip2, 0);
+- break;
+- }
+ case MONO_PATCH_INFO_METHOD_REL:
+ case MONO_PATCH_INFO_R8:
+ case MONO_PATCH_INFO_R4:
+@@ -4761,6 +4764,7 @@
#define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
@@ -27,7 +51,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,
-@@ -4728,27 +4734,37 @@
+@@ -4772,27 +4776,37 @@
* integer overflow.
*/
gboolean
@@ -71,10 +95,10 @@
- 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
}
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.h 2006/10/07 18:16:34 1.10
+++ /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-amd64.h 2006/10/08 00:17:29 1.11
@@ -1,6 +1,6 @@
---- mono/mini/mini-amd64.h.orig Tue Aug 2 17:52:47 2005
-+++ mono/mini/mini-amd64.h Tue Aug 2 17:53:40 2005
-@@ -130,7 +130,7 @@
+--- mono/mini/mini-amd64.h.orig Wed Jul 5 17:55:50 2006
++++ mono/mini/mini-amd64.h Sun Sep 17 16:50:25 2006
+@@ -159,7 +159,7 @@
guint64 r15;
} MonoContext;
@@ -9,7 +9,7 @@
# define SC_EAX sc_eax
# define SC_EBX sc_ebx
# define SC_ECX sc_ecx
-@@ -140,7 +140,7 @@
+@@ -169,7 +169,7 @@
# define SC_ESP sc_esp
# define SC_EDI sc_edi
# define SC_ESI sc_esi
@@ -18,7 +18,7 @@
# define SC_EAX rax
# define SC_EBX rbx
# define SC_ECX rcx
-@@ -160,7 +160,7 @@
+@@ -189,7 +189,7 @@
# define SC_R14 r14
# define SC_R15 r15
@@ -27,7 +27,18 @@
#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->rip = (long)(ip); } while (0);
#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->rbp = (long)(bp); } while (0);
-@@ -215,6 +215,29 @@
+@@ -227,6 +227,10 @@
+
+ #endif
+
++#ifdef __FreeBSD__
++#define MONO_AMD64_NO_MAP32BIT
++#endif
++
+ #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
+ #define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
+
+@@ -247,6 +251,29 @@
gboolean
mono_amd64_is_sse2 (void);
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_mini-exceptions.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_tramp-amd64.c,v
rcsdiff: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_mini_tramp-amd64.c,v: Symbolic name `NONE' is undefined.
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-mono_utils_mono-codeman.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-os_dep.c,v
rcsdiff: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-os_dep.c,v: Symbolic name `NONE' is undefined.
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/lang/mono/files/patch-support_stdio.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
More information about the Bsd-sharp-cvs
mailing list