From 5b69a2693ef75e051dd49db7e13908a960c47ac2 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 23 Feb 2018 09:18:38 +0000 Subject: [PATCH] Imported Upstream version 5.10.0.137 Former-commit-id: a598022caf837e5c0e35b6dfbe6ec2debbf5366a --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/bockbuild/package.py | 18 ++++-------------- external/bockbuild/bockbuild/util/util.py | 2 +- mcs/build/common/Consts.cs | 2 +- .../ReferenceSources/BinaryCompatibility.cs | 7 +++++++ mcs/class/System.XML/System.Xml.dll.sources | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/Makefile.am | 12 +++++++++--- mono/mini/Makefile.am.in | 12 +++++++++--- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/mini.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 42 files changed, 64 insertions(+), 55 deletions(-) create mode 100644 mcs/class/System.XML/ReferenceSources/BinaryCompatibility.cs diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index d55b248206..5040f865fe 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -0e5069804c3d90814f4f68a89510b58148390a78 \ No newline at end of file +bda83dbed0a353d5c9aae1163f4b999e709735eb \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 08aaeb7cbe..3ea098c786 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -e4efeac42335109229714144733b3091f80ae170 \ No newline at end of file +eba046d8b65fc42f0134cee4678b67368a542fac \ No newline at end of file diff --git a/external/bockbuild/bockbuild/package.py b/external/bockbuild/bockbuild/package.py index f719d17e35..263e001493 100644 --- a/external/bockbuild/bockbuild/package.py +++ b/external/bockbuild/bockbuild/package.py @@ -12,15 +12,6 @@ from util.util import * import functools -# FancyURLopener is incorrectly documented; this working handler was -# copied from -# https://mail.python.org/pipermail/python-bugs-list/2006-February/032155.html -class MyUrlOpener(urllib.FancyURLopener): - - def http_error_default(*args, **kwargs): - return urllib.URLopener.http_error_default(*args, **kwargs) - - class Package: def __init__(self, name, version=None, organization=None, configure_flags=None, sources=None, revision=None, git_branch=None, source_dir_name=None, override_properties=None, configure=None): @@ -292,11 +283,10 @@ class Package: def checkout_archive(archive, cache_dest, workspace_dir): def create_cache(): progress('Downloading: %s' % archive) - try: - filename, message = MyUrlOpener().retrieve(archive, cache_dest) - except IOError as e: - raise CommandException( - '%s error downloading %s' % (e[1], archive)) + curl_bin = which('curl') + if not curl_bin: + error('curl not found in PATH') + run (curl_bin,['-L','-o', cache_dest, archive], None) def update_cache(): pass diff --git a/external/bockbuild/bockbuild/util/util.py b/external/bockbuild/bockbuild/util/util.py index 9fe76b8469..15a8cef7a3 100644 --- a/external/bockbuild/bockbuild/util/util.py +++ b/external/bockbuild/bockbuild/util/util.py @@ -674,7 +674,7 @@ def run(cmd, args, cwd, env=None): proc = subprocess.Popen(cmd_list, shell=False, cwd=cwd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) except Exception as e: - error(e) + error(str(e)) stdout, stderr = proc.communicate() exit_code = proc.returncode diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index a0c507007f..41b85217db 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.10.0.132"; + public const string MonoVersion = "5.10.0.137"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/System.XML/ReferenceSources/BinaryCompatibility.cs b/mcs/class/System.XML/ReferenceSources/BinaryCompatibility.cs new file mode 100644 index 0000000000..20c4e88704 --- /dev/null +++ b/mcs/class/System.XML/ReferenceSources/BinaryCompatibility.cs @@ -0,0 +1,7 @@ +namespace System.Xml +{ + static class BinaryCompatibility + { + public static bool TargetsAtLeast_Desktop_V4_5_2 => true; + } +} \ No newline at end of file diff --git a/mcs/class/System.XML/System.Xml.dll.sources b/mcs/class/System.XML/System.Xml.dll.sources index 5f005255de..19dfe3dd7d 100644 --- a/mcs/class/System.XML/System.Xml.dll.sources +++ b/mcs/class/System.XML/System.Xml.dll.sources @@ -5,6 +5,7 @@ Assembly/AssemblyInfo.cs ReferenceSources/Res.cs ReferenceSources/LocalAppContextSwitches.cs ReferenceSources/ThisAssembly.cs +ReferenceSources/BinaryCompatibility.cs ../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs ../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs ../referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs @@ -237,7 +238,6 @@ ReferenceSources/ThisAssembly.cs ../referencesource/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs ../referencesource/System.Xml/System/Xml/Cache/XPathNodeView.cs ../referencesource/System.Xml/System/Xml/Cache/XPathNodeViewPropertyDescriptor.cs -../referencesource/System.Xml/System/Xml/Core/BinaryCompatibility.cs ../referencesource/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs ../referencesource/System.Xml/System/Xml/Core/ConformanceLevel.cs ../referencesource/System.Xml/System/Xml/Core/DtdProcessing.cs diff --git a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index e372b7d7a4..f17f10efc4 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ce18802ab9fddeab8c3df4d80d4920c0078beb8a \ No newline at end of file +044ae0ba30360ac8046e2a0e515420f95b288f46 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index d77aa7a0b7..670972ca8c 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -70bd018a65dbc16d9249e9f89aeb73904e06ae5a \ No newline at end of file +cc673b22139b4cc71266e2ee597fe4e505845566 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index 7fb8a31951..0c282b6a04 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d66447f952feb4ec5829e5829e3d25dd8af939e4 \ No newline at end of file +7751944281f48f2205099723e6efbfb26620a396 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index d8a1422d96..d12c41fd24 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bc2df173bcd5877ac4b9a0147065291f7090ede0 \ No newline at end of file +de07b190ab40f5a096608c4d885bbd098152cd0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index 2fe6a0dc3f..4a87367759 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a \ No newline at end of file +edd8ee3d35b335e383a211e9b690fb94721f2abb \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index a98a37b590..6d8a74734f 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -73f330f118271340beadba9943f025f51326505b \ No newline at end of file +f4927f8651f063086e19752ea214536075e84c1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index 251d9a20c9..f416987915 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -90445e4b34c276c86330ebdab580339e96320d17 \ No newline at end of file +62aa938719e0ef286376395e6c8f851ecfd89337 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index e372b7d7a4..f17f10efc4 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ce18802ab9fddeab8c3df4d80d4920c0078beb8a \ No newline at end of file +044ae0ba30360ac8046e2a0e515420f95b288f46 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index d77aa7a0b7..670972ca8c 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -70bd018a65dbc16d9249e9f89aeb73904e06ae5a \ No newline at end of file +cc673b22139b4cc71266e2ee597fe4e505845566 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index 7fb8a31951..0c282b6a04 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d66447f952feb4ec5829e5829e3d25dd8af939e4 \ No newline at end of file +7751944281f48f2205099723e6efbfb26620a396 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index d8a1422d96..d12c41fd24 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bc2df173bcd5877ac4b9a0147065291f7090ede0 \ No newline at end of file +de07b190ab40f5a096608c4d885bbd098152cd0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index 2fe6a0dc3f..4a87367759 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a \ No newline at end of file +edd8ee3d35b335e383a211e9b690fb94721f2abb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index a98a37b590..6d8a74734f 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -73f330f118271340beadba9943f025f51326505b \ No newline at end of file +f4927f8651f063086e19752ea214536075e84c1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index 251d9a20c9..f416987915 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -90445e4b34c276c86330ebdab580339e96320d17 \ No newline at end of file +62aa938719e0ef286376395e6c8f851ecfd89337 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index e372b7d7a4..f17f10efc4 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -ce18802ab9fddeab8c3df4d80d4920c0078beb8a \ No newline at end of file +044ae0ba30360ac8046e2a0e515420f95b288f46 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index d77aa7a0b7..670972ca8c 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -70bd018a65dbc16d9249e9f89aeb73904e06ae5a \ No newline at end of file +cc673b22139b4cc71266e2ee597fe4e505845566 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index 7fb8a31951..0c282b6a04 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d66447f952feb4ec5829e5829e3d25dd8af939e4 \ No newline at end of file +7751944281f48f2205099723e6efbfb26620a396 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index d8a1422d96..d12c41fd24 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -bc2df173bcd5877ac4b9a0147065291f7090ede0 \ No newline at end of file +de07b190ab40f5a096608c4d885bbd098152cd0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index 2fe6a0dc3f..4a87367759 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5ce5b47ab7ee19494ca4bb2e4d7fe0285165199a \ No newline at end of file +edd8ee3d35b335e383a211e9b690fb94721f2abb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index a98a37b590..6d8a74734f 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -73f330f118271340beadba9943f025f51326505b \ No newline at end of file +f4927f8651f063086e19752ea214536075e84c1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index 251d9a20c9..f416987915 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -90445e4b34c276c86330ebdab580339e96320d17 \ No newline at end of file +62aa938719e0ef286376395e6c8f851ecfd89337 \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index a33fe4df46..b9a72ba56c 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -786,6 +786,9 @@ llvmaotcheck: gsharedvtcheck: $(MAKE) fullaotcheck GSHAREDVT=1 +hybridcheck: + $(MAKE) fullaotcheck HYBRID=1 + fullaot_regtests = $(regtests) fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll @@ -818,15 +821,18 @@ FULLAOT_LIBS = $(filter-out $(FULLAOT_LIBS_DISABLED),$(FULLAOT_LIBS_UNIVERSAL)) FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp +FULLAOT_AOT_ARGS=$(if $(HYBRID),hybrid,full) +FULLAOT_ARGS=$(if $(HYBRID),--hybrid-aot,--full-aot) + # This currently only works on amd64/arm fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps) rm -rf $(FULLAOT_TMP_DIR) mkdir $(FULLAOT_TMP_DIR) - $(MAKE) fullaot-libs AOT_FLAGS="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT) + $(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT) cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/ - MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1 + MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1 ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/ - for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --full-aot $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done + for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done # This can run in parallel fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS)) diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index a33fe4df46..b9a72ba56c 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -786,6 +786,9 @@ llvmaotcheck: gsharedvtcheck: $(MAKE) fullaotcheck GSHAREDVT=1 +hybridcheck: + $(MAKE) fullaotcheck HYBRID=1 + fullaot_regtests = $(regtests) fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll @@ -818,15 +821,18 @@ FULLAOT_LIBS = $(filter-out $(FULLAOT_LIBS_DISABLED),$(FULLAOT_LIBS_UNIVERSAL)) FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp +FULLAOT_AOT_ARGS=$(if $(HYBRID),hybrid,full) +FULLAOT_ARGS=$(if $(HYBRID),--hybrid-aot,--full-aot) + # This currently only works on amd64/arm fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps) rm -rf $(FULLAOT_TMP_DIR) mkdir $(FULLAOT_TMP_DIR) - $(MAKE) fullaot-libs AOT_FLAGS="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT) + $(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT) cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/ - MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="full,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1 + MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1 ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/ - for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --full-aot $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done + for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done # This can run in parallel fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS)) diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 296c739916..8592e6a3dd 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -5ca98ed1bfac018a95c2b108d05f285184da0b02 \ No newline at end of file +22a194c7230dfadcaa4ff33d31d209c6c51c388e \ No newline at end of file diff --git a/mono/mini/mini.c.REMOVED.git-id b/mono/mini/mini.c.REMOVED.git-id index b06433d2c3..5853021f02 100644 --- a/mono/mini/mini.c.REMOVED.git-id +++ b/mono/mini/mini.c.REMOVED.git-id @@ -1 +1 @@ -202218e11ec57b6a554aa3c292d81c9715ace2e6 \ No newline at end of file +af642c20307dbff5cb4f53ca18e050e56fb26cb4 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 2b7a3aa967..db2aad8bfe 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/4adf822" +#define FULL_VERSION "explicit/947e457" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index fa44eeb897b64452d3ab04da892e738d90d06702..e0affdcfca046f70558e1468e61a4e51b6567b94 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aL61p^B!W5dmFxQw^}N^}Nw delta 20 bcmbQIHBW29Q!aKR1p^B!6XVTqxQw^}N_z%( diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 6678018ed5..6acafe0acf 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -7770d52688c3155ae03c4f0ec0ddc7e4260c3f1a \ No newline at end of file +7846070327214765b6c27bedaeb95a3aa33b1acf \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index d047bd34ea18087193153eefa32bd3c7c24ce74a..27b6bd9a1630db655f51f5c34b9d3f4777f3db18 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)kf`NsVvEgP@#VK+CQIrO& delta 20 bcmX?Ef3kjqo+7)Ef`NsViScGr#VK+CQJV&> diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9ede889968..a396c230e6 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -a4c3dcf6e6b105951fb200e08d3fd2a43daa7c7f \ No newline at end of file +2febbd8b2edd63be6567c8d23d0a4adde9f8757b \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d3cfc5405ca7acbb381ce3b941bcd4c3957a0581..54132a32c04e544e595edc6619baf4958a3914b5 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?8XWP7FNcFoB7oXv;bh{2L}KE delta 22 dcmeyri1Gg-#tj_m>_!R(7FH(4oB7oXv;bi32MGWG diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 02f28434aa..16e37badb7 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -692d6f200d94510c881b88aaeec2314f2bb56246 \ No newline at end of file +75ce49627aba359ce842d79b6963923661f61535 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 4de7c4f6ec..495f4f537f 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.0.132\n" +"Project-Id-Version: mono 5.10.0.137\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-02-22 08:43+0000\n" +"POT-Creation-Date: 2018-02-23 08:31+0000\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 e85a19038493875353128c09f1d4a5f8a5c81142..ca66835af75cfa3e17e43498a11c13a7580d4388 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*^LzpEUb(TH>XZzYzF{s-3WaE delta 22 ecmaF1gXP%{mJM-J*^LwoEUZk7H>XZzYzF{s