? _tmpinst
? x
? data/net_1_1/Makefile
? data/net_1_1/Makefile.in
? data/net_2_0/Makefile
? data/net_2_0/Makefile.in
? mono/arch/ppc-codegen.h
? mono/benchmark/code-reorder.cs
? mono/benchmark/t
? mono/benchmark/tt
? mono/benchmark/x
? mono/metadata/x
? mono/mini/one.patch
? mono/mini/t.cs
? mono/mini/temp.patch
? mono/mini/tempdiff
? mono/mini/x
Index: mono/mini/mini.c
===================================================================
RCS file: /cvs/public/mono/mono/mini/mini.c,v
retrieving revision 1.273
diff -u -r1.273 mini.c
--- mono/mini/mini.c	28 Jul 2004 19:15:21 -0000	1.273
+++ mono/mini/mini.c	2 Aug 2004 04:11:40 -0000
@@ -46,6 +46,7 @@
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/mono-debug-debugger.h>
 #include <mono/metadata/monitor.h>
+#include <mono/os/gc_wrapper.h>
 
 #include "mini.h"
 #include <string.h>
@@ -8182,6 +8183,8 @@
 
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
+	
+	GC_init ();
 
 	mono_jit_tls_id = TlsAlloc ();
 	setup_jit_tls_data ((gpointer)-1, mono_thread_abort);
Index: mono/os/gc_wrapper.h
===================================================================
RCS file: /cvs/public/mono/mono/os/gc_wrapper.h,v
retrieving revision 1.9
diff -u -r1.9 gc_wrapper.h
--- mono/os/gc_wrapper.h	14 Jul 2004 07:43:18 -0000	1.9
+++ mono/os/gc_wrapper.h	2 Aug 2004 04:11:41 -0000
@@ -5,11 +5,22 @@
 
 #ifdef HAVE_BOEHM_GC
 
+
+
 #ifdef	HAVE_GC_GC_H
 #include <gc/gc.h>
 #include <gc/gc_typed.h>
 #include <gc/gc_gcj.h>
 #include <gc/gc_mark.h>
+
+/* we want to use thread local allocations -- the headers
+ * are nasty, we must set GC_REDIRECT_TO_LOCAL *after* the
+ * gcj header, but before gc_local_alloc
+ */
+#define GC_REDIRECT_TO_LOCAL
+#define GC_GCJ_SUPPORT
+
+#include <gc/gc_local_alloc.h>
 #else
 
 #if defined(HAVE_GC_H) || defined(USE_INCLUDED_LIBGC)
@@ -17,6 +28,15 @@
 #include <gc_typed.h>
 #include <gc_gcj.h>
 #include <gc_mark.h>
+
+/* we want to use thread local allocations -- the headers
+ * are nasty, we must set GC_REDIRECT_TO_LOCAL *after* the
+ * gcj header, but before gc_local_alloc
+ */
+#define GC_REDIRECT_TO_LOCAL
+#define GC_GCJ_SUPPORT
+
+#include <gc_local_alloc.h>
 #else
 #error have boehm GC without headers, you probably need to install them by hand
 #endif