Move some defines to sgen-conf.h so managed wrappers are actually used.

diff --git a/mono/metadata/sgen-alloc.c b/mono/metadata/sgen-alloc.c
index 35f318f4285101100efc24fcb2d6be5d3d1b2ca8..a14a05a65e7ef007f60773e51315911a4720f06c 100644 (file)
--- a/mono/metadata/sgen-alloc.c
+++ b/mono/metadata/sgen-alloc.c
@@ -47,10 +47,26 @@
 #include "metadata/sgen-gc.h"
 #include "metadata/sgen-protocol.h"
 #include "metadata/profiler-private.h"
+#include "metadata/marshal.h"
+#include "metadata/method-builder.h"
 #include "utils/mono-memory-model.h"
 #include "utils/mono-counters.h"
 
 #define ALIGN_UP               SGEN_ALIGN_UP
+#define ALLOC_ALIGN            SGEN_ALLOC_ALIGN
+#define ALLOC_ALIGN_BITS       SGEN_ALLOC_ALIGN_BITS
+#define MAX_SMALL_OBJ_SIZE     SGEN_MAX_SMALL_OBJ_SIZE
+#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
+
+#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
+       a = i,
+
+enum {
+#include "mono/cil/opcode.def"
+       CEE_LAST
+};
+
+#undef OPDEF
 
 #ifdef HEAVY_STATISTICS
 static long long stat_objects_alloced = 0;

diff --git a/mono/metadata/sgen-conf.h b/mono/metadata/sgen-conf.h
index 2652b6485b62d9972fedf648a7b6192d3d63b0a7..9d3e103fd02f60a2a9e30278148430a62092c9d8 100644 (file)
--- a/mono/metadata/sgen-conf.h
+++ b/mono/metadata/sgen-conf.h
@@ -55,6 +55,21 @@ typedef guint64 mword;
  */
 //#define SGEN_BINARY_PROTOCOL
 
+/*
+ * Define this and use the "xdomain-checks" MONO_GC_DEBUG option to
+ * have cross-domain checks in the write barrier.
+ */
+//#define XDOMAIN_CHECKS_IN_WBARRIER
+
+#ifndef SGEN_BINARY_PROTOCOL
+#ifndef HEAVY_STATISTICS
+#define MANAGED_ALLOCATION
+#ifndef XDOMAIN_CHECKS_IN_WBARRIER
+#define MANAGED_WBARRIER
+#endif
+#endif
+#endif
+
 /*
  * Maximum level of debug to enable on this build.
  * Making this a static variable enables us to put logging in a lot of places.

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 68c04e06a56dccc7e16c8fc19864de905607321d..9cd4557dd04282a2f1ce056db65dbf821c13b84e 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -3690,21 +3690,6 @@ mono_sgen_fill_thread_info_for_suspend (SgenThreadInfo *info)
 #endif
 }
 
-/*
- * Define this and use the "xdomain-checks" MONO_GC_DEBUG option to
- * have cross-domain checks in the write barrier.
- */
-//#define XDOMAIN_CHECKS_IN_WBARRIER
-
-#ifndef SGEN_BINARY_PROTOCOL
-#ifndef HEAVY_STATISTICS
-#define MANAGED_ALLOCATION
-#ifndef XDOMAIN_CHECKS_IN_WBARRIER
-#define MANAGED_WBARRIER
-#endif
-#endif
-#endif
-
 static gboolean
 is_ip_in_managed_allocator (MonoDomain *domain, gpointer ip);