2009-05-17 Zoltan Varga <vargaz@gmail.com>

	* mini-ppc.h mini-arm.h mini-x86.h mini-amd64.h: Add
	MONO_ARCH_GSHARED_SUPPORTED define.

	* mini.c (mini_init): Use the MONO_ARCH_GSHARED_SUPPORTED define.

svn path=/trunk/mono/; revision=134290

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index e509ae7482cf0eeed807b1d6e8797813eb9577e7..7cccbfe91b4f9d20b0c59ee1d3beb73704649c63 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-17  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini-ppc.h mini-arm.h mini-x86.h mini-amd64.h: Add 
+       MONO_ARCH_GSHARED_SUPPORTED define.
+
+       * mini.c (mini_init): Use the MONO_ARCH_GSHARED_SUPPORTED define.
+
        * mini-arm.c mini.c: Get rid of the unused mono_arch_fixup_jinfo ()
        function.
 

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 5f622488a4d1e89e2a6cd9e0b199de88685fdda1..3907fc83bfc01855bcb80dae675292b7b5cda9a4 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -336,6 +336,8 @@ typedef struct {
 #define MONO_AMD64_NO_PUSHES 1
 #endif
 
+#define MONO_ARCH_GSHARED_SUPPORTED 1
+
 #define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_metadata_signature_equal ((caller_sig), (callee_sig))
 
 /* Used for optimization, not complete */

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 935143f0a472c9dfd5cb09bfb8d6dd36b4f77842..0b06643ed5acbd0be7e7c6bb402dc58773b4532c 100644 (file)
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -154,6 +154,8 @@ typedef struct MonoCompileArch {
 
 #define MONO_ARCH_AOT_SUPPORTED 1
 
+#define MONO_ARCH_GSHARED_SUPPORTED 1
+
 /* ARM doesn't have too many registers, so we have to use a callee saved one */
 #define MONO_ARCH_RGCTX_REG ARMREG_V5
 /* First argument reg */

diff --git a/mono/mini/mini-ppc.h b/mono/mini/mini-ppc.h
index 2ef91978acf31afb369ec801bf92ccf764e2181e..b5455f44f63f65cd02986536a0dfff9245957d5d 100644 (file)
--- a/mono/mini/mini-ppc.h
+++ b/mono/mini/mini-ppc.h
@@ -170,6 +170,8 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE 1
 #endif
 
+#define MONO_ARCH_GSHARED_SUPPORTED 1
+
 #define MONO_ARCH_NEED_DIV_CHECK 1
 
 #define PPC_NUM_REG_ARGS (PPC_LAST_ARG_REG-PPC_FIRST_ARG_REG+1)

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index 96c4ad72fcd41ca6ad80ca76117500764e5d840e..11e48b2e5bd0c913588279057af8537fc7289688 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -308,6 +308,8 @@ typedef struct {
 #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1
 #endif
 
+#define MONO_ARCH_GSHARED_SUPPORTED 1
+
 /* Used for optimization, not complete */
 #define MONO_ARCH_IS_OP_MEMBASE(opcode) ((opcode) == OP_X86_PUSH_MEMBASE)
 

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 66d5c9f01dce0cc695b0fc9feef5e411d7204301..039fe06bbef8ecf15fd911f2a3268d169468137b 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -4738,7 +4738,7 @@ mini_init (const char *filename, const char *runtime_version)
        if (default_opt & MONO_OPT_AOT)
                mono_aot_init ();
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__mono_ppc__)
+#ifdef MONO_ARCH_GSHARED_SUPPORTED
        mono_set_generic_sharing_supported (TRUE);
 #endif