Merge branch 'Rebase-Unity-3.x-onto-Mono-2.8' of...

Merge branch 'Rebase-Unity-3.x-onto-Mono-2.8' of github.com:Unity-Technologies/mono into Rebase-Unity-3.x-onto-Mono-2.8

build_classlibs_osx.pl

@@ -201,7 +201,7 @@ sub BuildUnityScriptForUnity
 	
 	cp("$booCheckout/ide-build/Boo.Lang*.dll $monoprefixUnity/");
 	cp("$booCheckout/ide-build/booc.exe $monoprefixUnity/");
-	UnityBooc("-out:$monoprefixUnity/Boo.Lang.Extensions.dll -noconfig -nostdlib -srcdir:$booCheckout/src/Boo.Lang.Extensions -r:System.dll -r:mscorlib.dll -r:Boo.Lang.dll");
+	UnityBooc("-out:$monoprefixUnity/Boo.Lang.Extensions.dll -noconfig -nostdlib -srcdir:$booCheckout/src/Boo.Lang.Extensions -r:System.dll -r:System.Core.dll -r:mscorlib.dll -r:Boo.Lang.dll");
 	UnityBooc("-out:$monoprefixUnity/Boo.Lang.Useful.dll -srcdir:$booCheckout/src/Boo.Lang.Useful -r:Boo.Lang.Parser");
 	UnityBooc("-out:$monoprefixUnity/Boo.Lang.PatternMatching.dll -srcdir:$booCheckout/src/Boo.Lang.PatternMatching");
 	

mcs/mcs/import.cs

@@ -293,6 +293,7 @@ namespace Mono.CSharp
 					const Modifiers conflict_mask = Modifiers.AccessibilityMask & ~Modifiers.INTERNAL;
 					if (candidate == null || (candidate.Modifiers & conflict_mask) != (mod & conflict_mask) || candidate.IsStatic) {
 						mod &= ~Modifiers.OVERRIDE;
+						mod |= Modifiers.VIRTUAL;
 					}
 				}
 			}

mono/metadata/domain-internals.h

@@ -535,7 +535,7 @@ gboolean
 mono_runtime_get_no_exec (void) MONO_INTERNAL;
 
 gboolean
-mono_assembly_name_parse (const char *name, MonoAssemblyName *aname) MONO_INTERNAL;
+mono_assembly_name_parse (const char *name, MonoAssemblyName *aname);
 
 MonoImage *mono_assembly_open_from_bundle (const char *filename,
 					   MonoImageOpenStatus *status,

mono/metadata/null-gc.c

@@ -226,7 +226,11 @@ mono_gc_get_managed_allocator_types (void)
 const char *
 mono_gc_get_gc_name (void)
 {
+#if defined (MINGW_CROSS_COMPILE) && (defined (TARGET_PS3) || defined (TARGET_XBOX360))
+	return "boehm";
+#else
 	return "null";
+#endif
 }
 
 void

mono/metadata/threads-types.h

@@ -215,8 +215,8 @@ void mono_thread_abort_all_other_threads (void) MONO_INTERNAL;
 void mono_thread_suspend_all_other_threads (void) MONO_INTERNAL;
 gboolean mono_threads_abort_appdomain_threads (MonoDomain *domain, int timeout) MONO_INTERNAL;
 
-void mono_thread_push_appdomain_ref (MonoDomain *domain) MONO_INTERNAL;
-void mono_thread_pop_appdomain_ref (void) MONO_INTERNAL;
+void mono_thread_push_appdomain_ref (MonoDomain *domain);
+void mono_thread_pop_appdomain_ref (void);
 gboolean mono_thread_has_appdomain_ref (MonoThread *thread, MonoDomain *domain) MONO_INTERNAL;
 
 void mono_threads_clear_cached_culture (MonoDomain *domain) MONO_INTERNAL;

mono/mini/driver.c

@@ -1438,7 +1438,7 @@ mono_main (int argc, char* argv[])
 			opt = parse_optimizations (argv [i] + 11);
 		} else if (strncmp (argv [i], "-O=", 3) == 0) {
 			opt = parse_optimizations (argv [i] + 3);
-#if !defined(_XBOX)
+#if !(defined (_XBOX) || defined (TARGET_PS3))
 		} else if (strcmp (argv [i], "--gc=sgen") == 0) {
 			if (!strcmp (mono_gc_get_gc_name (), "boehm")) {
 				GString *path = g_string_new (argv [0]);

msvc/mono.def

@@ -890,3 +890,8 @@ mono_win32_compat_ZeroMemory
 
 mono_runtime_unhandled_exception_policy_get
 mono_runtime_unhandled_exception_policy_set
+
+mono_assembly_name_parse
+mono_thread_push_appdomain_ref
+mono_thread_pop_appdomain_ref
+