Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

Makefile.am

@@ -50,14 +50,9 @@ noinst_DATA = mono-uninstalled.pc
 DISTCLEANFILES= mono-uninstalled.pc
 
 # building with monolite
-mcslib = $(mcs_topdir)/class/lib
-monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
 .PHONY: get-monolite-latest 
 get-monolite-latest:
-	-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
+	$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
-	-mkdir -p $(mcslib)/monolite
-	cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
-	cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
 
 if BITCODE
 BITCODE_CHECK=yes

Makefile.in

@@ -298,7 +298,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -396,7 +395,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -442,10 +440,6 @@ DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
 DISTCLEANFILES = mono-uninstalled.pc
-
-# building with monolite
-mcslib = $(mcs_topdir)/class/lib
-monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
 @BITCODE_TRUE@BITCODE_CHECK = yes
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -948,12 +942,11 @@ dist-hook:
 	rm -rf `find $(top_distdir)/external -path '*\.git'`
 	rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
 	rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
+
+# building with monolite
 .PHONY: get-monolite-latest 
 get-monolite-latest:
-	-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
+	$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
-	-mkdir -p $(mcslib)/monolite
-	cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
-	cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
 
 .PHONY: check-ci
 check-ci:

README.md

@@ -193,22 +193,18 @@ disable the compilation of a Mono runtime with the SGen garbage
 collector.
 
   * On platforms that support it, after building Mono, you will have
-both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm,
+both a `mono-boehm` binary and a `mono-sgen` binary. `mono-boehm` uses Boehm,
 while `mono-sgen` uses the Simple Generational GC.
 
-* `--with-gc=[included, boehm, none]` - Selects the default Boehm
+* `--with-libgc=[included, none]` - Selects the default Boehm
 garbage collector engine to use.
 
   * *included*: (*slightly modified Boehm GC*) This is the default
 value for the Boehm GC, and it's the most feature complete, it will
 allow Mono to use typed allocations and support the debugger.
 
-  * *boehm*: This is used to use a system-install Boehm GC, it is
-useful to test new features available in Boehm GC, but we do not
-recommend that people use this, as it disables a few features.
-
   * *none*:
-Disables the inclusion of a garbage collector.
+Disables the inclusion of a Boehm garbage collector.
 
   * This defaults to `included`.
 

acceptance-tests/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-1d85af9de41fd599926a3a180bdd0b2f2afe2fae
+7bda83765428ece9c74652f308a40e471958d84d

config.h.in

@@ -106,9 +106,6 @@
 /* Disable SIMD intrinsics related optimizations. */
 #undef DISABLE_SIMD
 
-/* Disable sockets support */
-#undef DISABLE_SOCKETS
-
 /* Disable Soft Debugger Agent. */
 #undef DISABLE_SOFT_DEBUG
 
@@ -467,9 +464,6 @@
 /* Define to 1 if you have the <libproc.h> header file. */
 #undef HAVE_LIBPROC_H
 
-/* Define to 1 if you have the `unwind' library (-lunwind). */
-#undef HAVE_LIBUNWIND
-
 /* Define to 1 if you have the <link.h> header file. */
 #undef HAVE_LINK_H
 
@@ -527,9 +521,6 @@
 /* Have MSG_NOSIGNAL */
 #undef HAVE_MSG_NOSIGNAL
 
-/* Define to 1 if you have the <nacl/nacl_dyncode.h> header file. */
-#undef HAVE_NACL_NACL_DYNCODE_H
-
 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
 
@@ -545,6 +536,9 @@
 /* No GC support. */
 #undef HAVE_NULL_GC
 
+/* Some VES is available at runtime */
+#undef HAVE_ONLINE_VES
+
 /* Define to 1 if you have the <pathconf.h> header file. */
 #undef HAVE_PATHCONF_H
 
@@ -1013,9 +1007,6 @@
 /* ... */
 #undef HOST_ARM64
 
-/* ... */
-#undef HOST_IA64
-
 /* ... */
 #undef HOST_MIPS
 
@@ -1154,9 +1145,6 @@
 /* byte order of target */
 #undef TARGET_BYTE_ORDER
 
-/* ... */
-#undef TARGET_IA64
-
 /* The JIT/AOT targets iOS */
 #undef TARGET_IOS
 
@@ -1166,9 +1154,6 @@
 /* ... */
 #undef TARGET_MIPS
 
-/* ... */
-#undef TARGET_NACL
-
 /* The JIT/AOT targets OSX */
 #undef TARGET_OSX
 
@@ -1240,6 +1225,3 @@
 
 /* ... */
 #undef __mono_ppc64__
-
-/* ... */
-#undef __native_client_codegen__

configure.REMOVED.git-id

@@ -1 +1 @@
-c85570f19627791a8b2715a6dcda5a9801ef05da
+4983f549ffc7653871992231faccc651ea216755

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-100cd2f08179a21f754d122f515a1708512b0190
+db56ea81331da24e34c3ea02e0cc19e0c3330fb4

data/Makefile.in

@@ -321,7 +321,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -419,7 +418,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_2_0/Browsers/Makefile.in

@@ -243,7 +243,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -341,7 +340,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_2_0/Makefile.in

@@ -303,7 +303,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -401,7 +400,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_4_0/Browsers/Makefile.in

@@ -243,7 +243,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -341,7 +340,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_4_0/Makefile.in

@@ -303,7 +303,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -401,7 +400,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_4_5/Browsers/Makefile.in

@@ -243,7 +243,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -341,7 +340,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

data/net_4_5/Makefile.in

@@ -303,7 +303,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -401,7 +400,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

docs/Makefile.in

@@ -243,7 +243,6 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
-MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -341,7 +340,6 @@ mkdir_p = @mkdir_p@
 mono_build_root = @mono_build_root@
 mono_cfg_dir = @mono_cfg_dir@
 mono_runtime = @mono_runtime@
-nacl_self_host = @nacl_self_host@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

docs/deploy/mono-api-embedding.html

@@ -873,7 +873,7 @@ mono_set_break_policy (MonoBreakPolicyFunc policy_callback)
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>policy_callback</i></td><td> the new callback function</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	<p /> 	 Allow embedders to decide wherther to actually obey breakpoint instructions 	 (both break IL instructions and <code>Debugger.Break</code> method calls), for example 	 to not allow an app to be aborted by a perfectly valid IL opcode when executing 	 untrusted or semi-trusted code. 	<p /> 	 <i>policy_callback</i> will be called every time a break point instruction needs to 	 be inserted with the method argument being the method that calls <code>Debugger.Break</code> 	 or has the IL <code>break</code> instruction. The callback should return <code>MONO_BREAK_POLICY_NEVER</code> 	 if it wants the breakpoint to not be effective in the given method. 	 <code>MONO_BREAK_POLICY_ALWAYS</code> is the default.</div>
+             <div> 	<p /> 	 Allow embedders to decide whether to actually obey breakpoint instructions 	 (both break IL instructions and <code>Debugger.Break</code> method calls), for example 	 to not allow an app to be aborted by a perfectly valid IL opcode when executing 	 untrusted or semi-trusted code. 	<p /> 	 <i>policy_callback</i> will be called every time a break point instruction needs to 	 be inserted with the method argument being the method that calls <code>Debugger.Break</code> 	 or has the IL <code>break</code> instruction. The callback should return <code>MONO_BREAK_POLICY_NEVER</code> 	 if it wants the breakpoint to not be effective in the given method. 	 <code>MONO_BREAK_POLICY_ALWAYS</code> is the default.</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->

docs/deploy/mono-api-exc.html

@@ -242,13 +242,13 @@ mono_raise_exception (MonoException *ex)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">void
-mono_unhandled_exception (MonoObject *exc)
+mono_unhandled_exception_checked (MonoObjectHandle exc, MonoError *error)
 
 </div>
             <p />
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>exc</i></td><td> exception thrown</td></tr></tbody></table>             <div class="mapi-section">Description</div>
-             <div> 	 This is a VM internal routine. 	<p /> 	 We call this function when we detect an unhandled exception 	 in the default domain. 	<p /> 	 It invokes the <code>UnhandledException</code> event in <code>AppDomain</code> or prints 	 a warning to the console </div>
+             <div> 	<p /> 	 This is a VM internal routine. 	<p /> 	 We call this function when we detect an unhandled exception 	 in the default domain. 	<p /> 	 It invokes the * UnhandledException event in AppDomain or prints 	 a warning to the console </div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->

docs/deploy/mono-api-internal.html

@@ -286,7 +286,7 @@ mono_unicode_from_external (const gchar *in, gsize *bytes)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">void*
-mono_marshal_alloc (gulong size, MonoError *error)
+mono_marshal_alloc (gsize size, MonoError *error)
 
 </div>
             <p />

docs/deploy/mono-api-reflection.html

@@ -281,7 +281,7 @@ mono_reflection_get_custom_attrs_blob (MonoReflectionAssembly *assembly, MonoObj
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoArray*
-mono_reflection_get_custom_attrs_by_type (MonoObject *obj, MonoClass *attr_klass, MonoError *error)
+mono_reflection_get_custom_attrs_by_type (MonoObject *obj_raw, MonoClass *attr_klass, MonoError *error)
 
 </div>
             <p />
@@ -306,7 +306,7 @@ mono_reflection_get_custom_attrs_by_type (MonoObject *obj, MonoClass *attr_klass
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoArray*
-mono_reflection_get_custom_attrs_data (MonoObject *obj)
+mono_reflection_get_custom_attrs_data (MonoObject *obj_raw)
 
 </div>
             <p />
@@ -330,7 +330,7 @@ mono_reflection_get_custom_attrs_data (MonoObject *obj)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoArray*
-mono_reflection_get_custom_attrs (MonoObject *obj)
+mono_reflection_get_custom_attrs (MonoObject *obj_raw)
 
 </div>
             <p />
@@ -457,7 +457,7 @@ mono_reflection_type_from_name (char *name, MonoImage *image)
 
             <div class="mapi-declaration mapi-section">Syntax</div>
             <div class="mapi-prototype">MonoCustomAttrInfo*
-mono_reflection_get_custom_attrs_info (MonoObject *obj)
+mono_reflection_get_custom_attrs_info (MonoObject *obj_raw)
 
 </div>
             <p />

eglib/src/eglib-config.h.in

@@ -32,7 +32,7 @@ typedef signed   @GSIZE@ gssize;
 #define G_HAVE_ISO_VARARGS
 #endif
 
-#if defined (__native_client__) || defined (HOST_WATCHOS)
+#if defined (HOST_WATCHOS)
 #undef G_BREAKPOINT
 #define G_BREAKPOINT()
 #endif