[runtime] Rename the MONO_GSHARING define to ENABLE_GSHAREDVT for consistency.

diff --git a/configure.in b/configure.in
index ad5ac82cfaebe1c55d308f8ea779b264582a7eac..6b9deddfb4bac2260ecb6c3f7fc8378ad95deba2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -954,7 +954,7 @@ fi
 
 AC_ARG_ENABLE(gsharing, [  --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
 if test x$enable_gsharing = xyes; then
-       AC_DEFINE(MONO_GSHARING,1,[Gsharing])
+       AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
 fi
 
 AC_ARG_ENABLE(native-types, [  --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
old mode 100755 (executable)
new mode 100644 (file)
index 1cbe18c..6b8f324
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -8653,7 +8653,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
        TV_DECLARE (atv);
        TV_DECLARE (btv);
 
-#if !defined(MONO_ARCH_GSHAREDVT_SUPPORTED) || !defined(MONO_GSHARING)
+#if !defined(MONO_ARCH_GSHAREDVT_SUPPORTED) || !defined(ENABLE_GSHAREDVT)
        if (opts & MONO_OPT_GSHAREDVT) {
                fprintf (stderr, "-O=gsharedvt not supported on this platform.\n");
                exit (1);

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/mono/mini/main.c b/mono/mini/main.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index be941d97226c871d1238cf5899e0722fe9ecf241..41edb9853b2e83635b0722475d5e7b0410b02b02 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -845,7 +845,7 @@ mono_arch_init (void)
        mono_aot_register_jit_icall ("mono_arm_throw_exception", mono_arm_throw_exception);
        mono_aot_register_jit_icall ("mono_arm_throw_exception_by_token", mono_arm_throw_exception_by_token);
        mono_aot_register_jit_icall ("mono_arm_resume_unwind", mono_arm_resume_unwind);
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
        mono_aot_register_jit_icall ("mono_arm_start_gsharedvt_call", mono_arm_start_gsharedvt_call);
 #endif
 
@@ -6864,7 +6864,7 @@ mono_arch_set_target (char *mtriple)
                eabi_supported = TRUE;
 }
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/mini-arm-gsharedvt.c"
 

diff --git a/mono/mini/mini-gc.c b/mono/mini/mini-gc.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index 283b7d85eeeaa8721dc0c48e8f5ff02260ffdc99..ab9245f26a948d2f0786bd28cc63b5e0fc41ed1f 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -2708,7 +2708,7 @@ mini_is_gsharedvt_variable_klass (MonoCompile *cfg, MonoClass *klass)
        return mini_is_gsharedvt_variable_type (cfg, &klass->byval_arg);
 }
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/mini-generic-sharing-gsharedvt.c"
 

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
old mode 100755 (executable)
new mode 100644 (file)
index 2875fe7..11ba8a9
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -763,7 +763,7 @@ mono_arch_init (void)
 
        mono_aot_register_jit_icall ("mono_x86_throw_exception", mono_x86_throw_exception);
        mono_aot_register_jit_icall ("mono_x86_throw_corlib_exception", mono_x86_throw_corlib_exception);
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
        mono_aot_register_jit_icall ("mono_x86_start_gsharedvt_call", mono_x86_start_gsharedvt_call);
 #endif
 }
@@ -6833,7 +6833,7 @@ mono_arch_init_lmf_ext (MonoLMFExt *ext, gpointer prev_lmf)
 
 #endif
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/mini-x86-gsharedvt.c"
 

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 6cbbbcd9de562e5a572d05aea0466047d9ddb172..534c2e20499304b2ee34e405ba8e95a110f53d12 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -7906,7 +7906,7 @@ mono_arch_get_gsharedvt_trampoline (MonoTrampInfo **info, gboolean aot)
 
 #endif
 
-#if defined(MONO_ARCH_GSHAREDVT_SUPPORTED) && !defined(MONO_GSHARING)
+#if defined(MONO_ARCH_GSHAREDVT_SUPPORTED) && !defined(ENABLE_GSHAREDVT)
 
 gboolean
 mono_arch_gsharedvt_sig_supported (MonoMethodSignature *sig)

diff --git a/mono/mini/tramp-arm.c b/mono/mini/tramp-arm.c
index b2a8ef7cf7ea61346905248edbb68dc8937b1a51..937655f0d70cbb7d5afde33403e6bc144feba4f6 100644 (file)
--- a/mono/mini/tramp-arm.c
+++ b/mono/mini/tramp-arm.c
@@ -1077,7 +1077,7 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint
 
 #endif
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/tramp-arm-gsharedvt.c"
 

diff --git a/mono/mini/tramp-x86.c b/mono/mini/tramp-x86.c
index 1d8cddd1a46d43df9383c1bbc9507c58f6c7c3ae..e98fe36d5144a649189b24ac1cc36af0f8cc67cf 100644 (file)
--- a/mono/mini/tramp-x86.c
+++ b/mono/mini/tramp-x86.c
@@ -1196,7 +1196,7 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint
        return start;
 }
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/tramp-x86-gsharedvt.c"