diff --git a/Makefile.in b/Makefile.in index f0873e25ff..a80823be98 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/config.h.in mkinstalldirs \ $(srcdir)/mono-core.spec.in $(srcdir)/mono-uninstalled.pc.in \ AUTHORS COPYING.LIB ChangeLog NEWS compile config.guess \ - config.rpath config.sub install-sh missing ltmain.sh + config.rpath config.sub depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ diff --git a/docs/deploy/mono-api-codegen.html b/docs/deploy/mono-api-codegen.html index a370ad8c3d..01dcc567d6 100644 --- a/docs/deploy/mono-api-codegen.html +++ b/docs/deploy/mono-api-codegen.html @@ -122,7 +122,7 @@ mono_code_manager_invalidate (MonoCodeManager *cman)
mono_code_manager_new_dynamic
MonoCodeManager* -mono_code_manager_new_dynamic (void) +mono_code_manager_new_dynamic (int bind_size)

@@ -134,6 +134,8 @@ mono_code_manager_new_dynamic (void) Creates a new code manager suitable for holding native code that can be used for single or small methods that need to be deallocated independently of other native code. + BIND_SIZE is the amount of memory reserved for storing thunks. If its 0, + the default size is used. diff --git a/docs/deploy/mono-api-internal.html b/docs/deploy/mono-api-internal.html index 22f51d2c2e..0ba9ccc20d 100644 --- a/docs/deploy/mono-api-internal.html +++ b/docs/deploy/mono-api-internal.html @@ -476,33 +476,6 @@ mono_loader_lock (void)

Prototype: mono_gc_enable

- -

-
mono_gc_is_finalizer_thread
- -
gboolean -mono_gc_is_finalizer_thread (MonoThread *thread) - -
-

-Parameters -

thread:
the thread to test.
-Remarks -

- In Mono objects are finalized asynchronously on a separate thread. - This routine tests whether the thread argument represents the - finalization thread. - -

- Returns true if thread is the finalization thread. - -

-
-
mono_gc_out_of_memory
- -
Prototype: mono_gc_out_of_memory
-

-

mono_gc_start_world
@@ -524,13 +497,6 @@ mono_gc_is_finalizer_thread (MonoThread *thread)
Prototype: mono_gc_alloc_fixed

-

-
-
mono_gc_enable_events
- -
Prototype: mono_gc_enable_events
-

-

mono_gc_free_fixed
diff --git a/docs/deploy/mono-api-jit.html b/docs/deploy/mono-api-jit.html index b26123c17b..f8f86ac094 100644 --- a/docs/deploy/mono-api-jit.html +++ b/docs/deploy/mono-api-jit.html @@ -111,7 +111,7 @@ mono_print_method_from_ip (void *ip) This prints the name of the method at address ip in the standard output. Unlike mono_pmip which returns a string, this routine - prints the value on the standard output. + prints the value on the standard output.
diff --git a/docs/deploy/mono-api-object.html b/docs/deploy/mono-api-object.html index 04f57c2540..18cfa0aa3c 100644 --- a/docs/deploy/mono-api-object.html +++ b/docs/deploy/mono-api-object.html @@ -108,7 +108,6 @@ MonoObject* mono_object_isinst gpointer mono_object_unbox (MonoObject *obj); MonoObject* mono_object_castclass_mbyref (MonoObject *obj, MonoClass *klass); - guint mono_object_get_size (MonoObject* o); MonoObject* mono_value_box (MonoDomain *domain, MonoClass *class, @@ -423,13 +422,6 @@ mono_object_castclass_mbyref (MonoObject *obj, MonoClass *klass)
obj if obj is derived from klass, throws an exception otherwise
-
-
-
mono_object_is_alive
- -
Prototype: mono_object_is_alive
-

-

mono_object_get_size
diff --git a/docs/deploy/mono-api-profiler.html b/docs/deploy/mono-api-profiler.html index cee44a4860..8703c31398 100644 --- a/docs/deploy/mono-api-profiler.html +++ b/docs/deploy/mono-api-profiler.html @@ -104,12 +104,12 @@
mono_profiler_install
void -mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback) +mono_profiler_install (MonoProfiler *prof, int version, MonoProfileFunc callback)

Parameters -

prof:
a MonoProfiler structure pointer, or a pointer to a derived structure.
callback:
the function to invoke at shutdown
+
prof:
a MonoProfiler structure pointer, or a pointer to a derived structure.
version:
profiler API version (see profiler.h)
callback:
the function to invoke at shutdown
Remarks

Use mono_profiler_install to activate profiling in the Mono runtime. diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs index bc3a5fbd15..bb6eb1185f 100644 --- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs +++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs @@ -73,6 +73,8 @@ namespace Microsoft.Build.Tasks { commandLine.AppendSwitchIfNotNull ("/main:", MainEntryPoint); // NoStandardLib + if (Bag ["NoStandardLib"] != null && NoStandardLib) + commandLine.AppendSwitch ("/nostdlib"); if (NoWarnings) commandLine.AppendSwitch ("/nowarn"); diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs index ce0812bcc1..644a2fc0b2 100644 --- a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs +++ b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs @@ -11,14 +11,17 @@ namespace System.Runtime.Caching { */ internal class SRef { - private Object _sizedRef; +// private Object _sizedRef; internal SRef (Object target) { - _sizedRef = target; +// _sizedRef = target; } internal long ApproximateSize { - get { return (long) Marshal.SizeOf (_sizedRef.GetType ()); } + get { + // TODO: .net uses System.SizedReference which contains approximate size after Gen 2 collection + return 16; + } } internal void Dispose() { diff --git a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id index 9d7ccb1569..1c1b80757f 100644 --- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -62d516907d70ecf17d5514d0b95eca311ec777cf \ No newline at end of file +c0601b9f4009f1bab9950f13bfc47c1bd2ab0633 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id index 910f453d37..18492af8d3 100644 --- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cd383f7f1e00c5c33b0d1ca418b3026590e16b82 \ No newline at end of file +bc2a11adca47ad33d784d35d25efddb11b6d375e \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id index b70286312a..37d7718c34 100644 --- a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0442610a0894deae436f4425d6ce61bfcf05f317 \ No newline at end of file +ca052b55848fabd417bf3831574d8cf686d794e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id index c41208ff93..bb38d24306 100644 --- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -8b55e7bf143fa497a0beb1248953d8a153f92e6b \ No newline at end of file +8fa97ae80be483b7c5d6c93ca8d7eda2446b0a50 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id index 699644ac37..9095711a28 100644 --- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -46943fbf58da39a463799c4588a4ae363eb08687 \ No newline at end of file +e76deb5174269b77c69662a96fa3321b040d91c5 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index a87dbd8f04..29a458eb10 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -f5a92d1da2d627310094847f1caea53b06b9cb06 \ No newline at end of file +ac019e412b2ae5715cf22065cd72c5765dd5aab5 \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 56b805d1d8..53101bb36b 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -a41c331587790269dc8edeb917e32a18c54ab218 \ No newline at end of file +57419ef38547f800bed1ac90debb76987485a936 \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index 59ac4a0cc1..4d8d8708a1 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -520a0a38f7184d287366c996c5ac92d8e7f5fac2 \ No newline at end of file +273bd37add87ac232bce4ae964cbae67b9954f6b \ No newline at end of file diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile index 949f3e5966..afa7c217fb 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -58,9 +58,11 @@ install-pcl-targets: $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0 $(INSTALL_DATA) targets/Microsoft.Portable.Common.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.Common.targets $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.CSharp.targets + $(INSTALL_DATA) targets/Microsoft.Portable.VisualBasic_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.VisualBasic.targets $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5 $(INSTALL_DATA) targets/Microsoft.Portable.Common.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.Common.targets $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.CSharp.targets + $(INSTALL_DATA) targets/Microsoft.Portable.VisualBasic_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.VisualBasic.targets $(INSTALL_DATA) targets/Microsoft.Portable.Core.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.targets $(INSTALL_DATA) targets/Microsoft.Portable.Core.props $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.props diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks index 14047e5e85..2155da3f27 100644 --- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks +++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks @@ -8,6 +8,7 @@ + diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks index b5cede2e44..01964063c0 100644 --- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks +++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks @@ -7,6 +7,7 @@ + diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks index fadb882f9f..fc9ec9cd11 100644 --- a/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks +++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks @@ -7,6 +7,7 @@ + diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks index 68fcc7708f..7df9a2928a 100644 --- a/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks +++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks @@ -8,6 +8,7 @@ + diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks index 1063058785..b183750f9e 100644 --- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks +++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks @@ -8,6 +8,7 @@ + diff --git a/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets index aba4cfa286..aa0a9ce0a2 100644 --- a/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets +++ b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets @@ -1,5 +1,4 @@  - .vb VB @@ -67,7 +66,7 @@ OptionStrictType="$(OptionStrictType)" OutputAssembly="@(IntermediateAssembly)" Platform="$(PlatformTarget)" - References="@(ResolvedFiles)" + References="@(ReferencePath)" RemoveIntegerChecks="$(RemoveIntegerChecks)" Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)" ResponseFiles="$(CompilerResponseFile)" diff --git a/mono/metadata/decimal-ms.c b/mono/metadata/decimal-ms.c index 798a10d123..d52e8c780b 100644 --- a/mono/metadata/decimal-ms.c +++ b/mono/metadata/decimal-ms.c @@ -2246,9 +2246,9 @@ mono_decimal_compare (MonoDecimal *left, MonoDecimal *right) } // - // Signs are different. Used signed byte compares + // Signs are different. Use signed byte comparison // - if ((char)left_sign > (char)right_sign) + if ((signed char)left_sign > (signed char)right_sign) return MONO_DECIMAL_CMP_GT; return MONO_DECIMAL_CMP_LT; } diff --git a/mono/metadata/process.c b/mono/metadata/process.c index f4d4e3044d..aec0704598 100644 --- a/mono/metadata/process.c +++ b/mono/metadata/process.c @@ -804,7 +804,7 @@ ves_icall_System_Diagnostics_Process_GetProcesses_internal (void) } procs = mono_array_new (mono_domain_get (), mono_get_int32_class (), count); if (sizeof (guint32) == sizeof (gpointer)) { - memcpy (mono_array_addr (procs, guint32, 0), pidarray, count); + memcpy (mono_array_addr (procs, guint32, 0), pidarray, count * sizeof (gint32)); } else { for (i = 0; i < count; ++i) *(mono_array_addr (procs, guint32, i)) = GPOINTER_TO_UINT (pidarray [i]); diff --git a/mono/mini/cpu-s390x.md b/mono/mini/cpu-s390x.md index d940b73a7e..bc1a513d40 100644 --- a/mono/mini/cpu-s390x.md +++ b/mono/mini/cpu-s390x.md @@ -139,7 +139,7 @@ i8const: dest:i len:20 icompare: src1:i src2:i len:4 icompare_imm: src1:i len:18 iconst: dest:i len:40 -jmp: len:46 +jmp: len:50 label: len:0 lcall: dest:o len:22 clob:c lcall_membase: dest:o src1:b len:12 clob:c diff --git a/mono/mini/version.h b/mono/mini/version.h index efe464022e..4e33370a7f 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "(detached/f802480" +#define FULL_VERSION "(detached/6d5afc1" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 14f70347de..b39d8ae73c 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index c648162f8e..ac2d809e7f 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -e479a6a67558b379e13d559e8326a8dc0d5f1ab0 \ No newline at end of file +65ba119d7cf3ba2d6756ceef408fa6d3c1dc41f3 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index d5d971dd58..9a9d84572d 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 77e0dc36b2..ca149736b2 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -1cd22c01af32cf437b18d500206ab25befc02703 \ No newline at end of file +199ee54afc43f2c14d7b11947233338b4a06aaad \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index a5e186ef80..bb7eae1ff6 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 700c782233..afb8c168ee 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -fca0b5eb04d0c8bf0e3ee8f1d1e21cbecc0e81af \ No newline at end of file +e8c87e11713ddafad0975aca279624dcc19e26f2 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index be536dd770..a705063d8c 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.0.1\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2015-05-08 19:08-0400\n" +"POT-Creation-Date: 2015-05-15 04:26-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 770161aff6..4ef4c1f643 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 5416431502..e4de31f88f 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -8de1f134737b30725e8d667ea0060017e55e7c15 \ No newline at end of file +03c731ab53b47f4e52a887e84858acb8c0e874e2 \ No newline at end of file