From dfcb8ecdef127d60d681d94fbe90cc6a47cd7fdf Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 11 Oct 2019 09:01:49 +0000 Subject: [PATCH] Imported Upstream version 6.6.0.123 Former-commit-id: b23bd22f7d18a697237446a84eea92f73ae923ec --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/aot-runtime.c.REMOVED.git-id | 2 +- mono/mini/aot-runtime.h | 4 +- mono/mini/mini-llvm.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-merp.c | 2 - mono/utils/mono-state.c | 35 +++++++++--------- mono/utils/mono-state.h | 2 +- msvc/Makefile.in | 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 +- 52 files changed, 66 insertions(+), 67 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 4b03322e1d..f667868a34 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -6e3c4811ade49d003f84eede9b4c021e1b80b98b \ No newline at end of file +f8b9aae84d66abdcff1d925684d1228e216c7cbf \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 6237e7f436..8dc68e3327 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -c50e2cfabcd9c9d6897460a876dd79552e2f3394 \ No newline at end of file +0f989de83e5558b7e9b97d44265e5d10dde97788 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 00c8d292d6..721b2fc349 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.6.0.121"; + public const string MonoVersion = "6.6.0.123"; 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/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index 10f1a919ca..5ebac39d99 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -03aa3be101b19caea4495f98a429c1b417d49e23 \ No newline at end of file +d59938ae4c7fb78071fddd308fafede5a7759365 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index 99597df5d0..fd356e1837 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0642431843fc8daeec9c6848fac04da3fb5a2ad5 \ No newline at end of file +5ba2e0e748a09592a0600ef20116faf8258b2118 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index ae36d837b4..625dd50a58 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -bb5ea6ff06acd1c513ca3251e12ce944e43414fa \ No newline at end of file +3811921ca6055d6d02525834df85e1b2495d1b07 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index d552c2e3f5..830787a525 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ff78b30b11a77d7a1194a23c1a033d61622c932c \ No newline at end of file +1ac474df12181d5acd1cf7d11f27390046057634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index 8b4447b336..ce9816bbc0 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5d9a0af640d7e4e68702e356ac1c5364f43804c0 \ No newline at end of file +7e0980369bff5d3ac0c02eface7aa7fb87353d4d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index f9f489db2b..d1797d7831 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21d684ba7228f6dfd5a076b1113c3dfa72bde87a \ No newline at end of file +107b463b2adb5356e895b7a720851db33a86c6df \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index b4916b5b9f..0f8f822f75 100644 --- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe78243973f077054d92ebd4604dfe2e8a3da6a7 \ No newline at end of file +ba129c1550a2f772601ff3a5fd92d47722a06a11 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index 10f1a919ca..5ebac39d99 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -03aa3be101b19caea4495f98a429c1b417d49e23 \ No newline at end of file +d59938ae4c7fb78071fddd308fafede5a7759365 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index 99597df5d0..fd356e1837 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0642431843fc8daeec9c6848fac04da3fb5a2ad5 \ No newline at end of file +5ba2e0e748a09592a0600ef20116faf8258b2118 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index ae36d837b4..625dd50a58 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -bb5ea6ff06acd1c513ca3251e12ce944e43414fa \ No newline at end of file +3811921ca6055d6d02525834df85e1b2495d1b07 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index d552c2e3f5..830787a525 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ff78b30b11a77d7a1194a23c1a033d61622c932c \ No newline at end of file +1ac474df12181d5acd1cf7d11f27390046057634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index 8b4447b336..ce9816bbc0 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5d9a0af640d7e4e68702e356ac1c5364f43804c0 \ No newline at end of file +7e0980369bff5d3ac0c02eface7aa7fb87353d4d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index f9f489db2b..d1797d7831 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21d684ba7228f6dfd5a076b1113c3dfa72bde87a \ No newline at end of file +107b463b2adb5356e895b7a720851db33a86c6df \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index 28d061b32d..570fcbbd16 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -e16d6224dcb22afb80cc5b911adafded076efefa \ No newline at end of file +9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index b4916b5b9f..0f8f822f75 100644 --- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe78243973f077054d92ebd4604dfe2e8a3da6a7 \ No newline at end of file +ba129c1550a2f772601ff3a5fd92d47722a06a11 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index 10f1a919ca..5ebac39d99 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -03aa3be101b19caea4495f98a429c1b417d49e23 \ No newline at end of file +d59938ae4c7fb78071fddd308fafede5a7759365 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index 99597df5d0..fd356e1837 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0642431843fc8daeec9c6848fac04da3fb5a2ad5 \ No newline at end of file +5ba2e0e748a09592a0600ef20116faf8258b2118 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index ae36d837b4..625dd50a58 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -bb5ea6ff06acd1c513ca3251e12ce944e43414fa \ No newline at end of file +3811921ca6055d6d02525834df85e1b2495d1b07 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index d552c2e3f5..830787a525 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ff78b30b11a77d7a1194a23c1a033d61622c932c \ No newline at end of file +1ac474df12181d5acd1cf7d11f27390046057634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index 8b4447b336..ce9816bbc0 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5d9a0af640d7e4e68702e356ac1c5364f43804c0 \ No newline at end of file +7e0980369bff5d3ac0c02eface7aa7fb87353d4d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index f9f489db2b..d1797d7831 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21d684ba7228f6dfd5a076b1113c3dfa72bde87a \ No newline at end of file +107b463b2adb5356e895b7a720851db33a86c6df \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index 28d061b32d..570fcbbd16 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -e16d6224dcb22afb80cc5b911adafded076efefa \ No newline at end of file +9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index b4916b5b9f..0f8f822f75 100644 --- a/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -fe78243973f077054d92ebd4604dfe2e8a3da6a7 \ No newline at end of file +ba129c1550a2f772601ff3a5fd92d47722a06a11 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id index 10f1a919ca..5ebac39d99 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -03aa3be101b19caea4495f98a429c1b417d49e23 \ No newline at end of file +d59938ae4c7fb78071fddd308fafede5a7759365 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id index 99597df5d0..fd356e1837 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0642431843fc8daeec9c6848fac04da3fb5a2ad5 \ No newline at end of file +5ba2e0e748a09592a0600ef20116faf8258b2118 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id index 91f84b2d56..514fb8a37a 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -5af86d1d9d0aa183f91206601f0de2eb248fe081 \ No newline at end of file +53bfedd7e6c66dfc7c02e17c96be722880dc2c85 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id index d552c2e3f5..830787a525 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -ff78b30b11a77d7a1194a23c1a033d61622c932c \ No newline at end of file +1ac474df12181d5acd1cf7d11f27390046057634 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id index 8b4447b336..ce9816bbc0 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -5d9a0af640d7e4e68702e356ac1c5364f43804c0 \ No newline at end of file +7e0980369bff5d3ac0c02eface7aa7fb87353d4d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id index f9f489db2b..d1797d7831 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -21d684ba7228f6dfd5a076b1113c3dfa72bde87a \ No newline at end of file +107b463b2adb5356e895b7a720851db33a86c6df \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id index 28d061b32d..570fcbbd16 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -e16d6224dcb22afb80cc5b911adafded076efefa \ No newline at end of file +9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id index d8984b95b2..33306fb5cc 100644 --- a/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b09b71b51ab2995a0dc16afe71fb5ce2e6da225a \ No newline at end of file +4de1547d6cd759c83e3b0583a488f1b15c399121 \ No newline at end of file diff --git a/mono/mini/aot-compiler.c.REMOVED.git-id b/mono/mini/aot-compiler.c.REMOVED.git-id index bcf92b6564..dbe086623d 100644 --- a/mono/mini/aot-compiler.c.REMOVED.git-id +++ b/mono/mini/aot-compiler.c.REMOVED.git-id @@ -1 +1 @@ -fc02ef1f3b7e66a97711dcd5bb389e143dc19b9c \ No newline at end of file +a9815b632ea4feb0752c87b5a32788120c31bf0a \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 1bf16e6219..8ae7dd033a 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -a823c849a52a5306ffa46e3a2ddf398be980b648 \ No newline at end of file +b99841c60ea289599e9489509cbd6f8cf9ac23bb \ No newline at end of file diff --git a/mono/mini/aot-runtime.h b/mono/mini/aot-runtime.h index 0d07118163..4f8949c3f0 100644 --- a/mono/mini/aot-runtime.h +++ b/mono/mini/aot-runtime.h @@ -11,7 +11,7 @@ #include "mini.h" /* Version number of the AOT file format */ -#define MONO_AOT_FILE_VERSION 169 +#define MONO_AOT_FILE_VERSION 170 #define MONO_AOT_TRAMP_PAGE_SIZE 16384 @@ -200,6 +200,8 @@ typedef struct MonoAotFileInfo guint32 double_align, long_align, generic_tramp_num, card_table_shift_bits, card_table_mask; /* The page size used by trampoline pages */ guint32 tramp_page_size; + /* Size of each entry stored at method_addresses */ + guint32 call_table_entry_size; /* * The number of GOT entries which need to be preinitialized when the * module is loaded. diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index 1ff932976a..6ca426a0e2 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -ffed1916a720a1e89261ce82336b46f65f37ed41 \ No newline at end of file +7050486fb0bc528260edf062d2a354c6d0534aa0 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index f24dfead26..72e6cfea7b 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/9a88a36" +#define FULL_VERSION "explicit/11e1499" diff --git a/mono/utils/mono-merp.c b/mono/utils/mono-merp.c index d2652e4790..2ee2ff9a7d 100644 --- a/mono/utils/mono-merp.c +++ b/mono/utils/mono-merp.c @@ -336,7 +336,6 @@ mono_merp_send (MERPStruct *merp) } else { int status; waitpid (pid, &status, 0); - gboolean exit_success = FALSE; int exit_status = FALSE; while (TRUE) { @@ -345,7 +344,6 @@ mono_merp_send (MERPStruct *merp) if (WIFEXITED(status)) { exit_status = WEXITSTATUS(status); - exit_success = TRUE; invoke_success = (exit_status == 0); break; } else if (WIFSIGNALED(status)) { diff --git a/mono/utils/mono-state.c b/mono/utils/mono-state.c index 47c3a1b068..5afc8a38d3 100644 --- a/mono/utils/mono-state.c +++ b/mono/utils/mono-state.c @@ -136,6 +136,15 @@ file_for_summary_stage (const char *directory, MonoSummaryStage stage, gchar *bu g_snprintf (buff, sizeof_buff, "%s%scrash_stage_%d", directory, G_DIR_SEPARATOR_S, stage); } +static void +create_stage_mark_file (void) +{ + char out_file [200]; + file_for_summary_stage (log.directory, log.level, out_file, sizeof(out_file)); + int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); + close(handle); +} + gboolean mono_summarize_set_timeline_dir (const char *directory) { @@ -156,30 +165,27 @@ mono_summarize_timeline_start (void) if (!configured_timeline_dir) return; - log.level = MonoSummarySetup; log.directory = configured_timeline_dir; + mono_summarize_timeline_phase_log (MonoSummarySetup); } void mono_summarize_double_fault_log (void) { - char out_file [200]; - file_for_summary_stage (log.directory, MonoSummaryDoubleFault, out_file, sizeof(out_file)); - int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); - close(handle); + mono_summarize_timeline_phase_log (MonoSummaryDoubleFault); } void mono_summarize_timeline_phase_log (MonoSummaryStage next) { - if (log.level == MonoSummaryNone) - return; - if (!log.directory) return; MonoSummaryStage out_level; switch (log.level) { + case MonoSummaryNone: + out_level = MonoSummarySetup; + break; case MonoSummarySetup: out_level = MonoSummarySuspendHandshake; break; @@ -223,23 +229,16 @@ mono_summarize_timeline_phase_log (MonoSummaryStage next) return; } - g_assertf(out_level == next, "Log Error: Log transition to %d, actual expected next step is %d\n", next, out_level); - - char out_file [200]; - memset (out_file, 0, sizeof(out_file)); - file_for_summary_stage (log.directory, out_level, out_file, sizeof(out_file)); - - int handle = g_open (out_file, O_WRONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); - close(handle); + g_assertf(out_level == next || next == MonoSummaryDoubleFault, "Log Error: Log transition to %d, actual expected next step is %d\n", next, out_level); + log.level = out_level; + create_stage_mark_file (); // To check, comment out normally // DO NOT MERGE UNCOMMENTED // As this does a lot of FILE io // // g_assert (out_level == mono_summarize_timeline_read_level (log.directory, FALSE)); - log.level = out_level; - if (out_level == MonoSummaryDone) memset (&log, 0, sizeof (log)); diff --git a/mono/utils/mono-state.h b/mono/utils/mono-state.h index cd3842a689..55a6d74919 100644 --- a/mono/utils/mono-state.h +++ b/mono/utils/mono-state.h @@ -21,7 +21,7 @@ #define MONO_NATIVE_STATE_PROTOCOL_VERSION "0.0.4" typedef enum { - MonoSummaryNone, + MonoSummaryNone = 0, MonoSummarySetup, MonoSummarySuspendHandshake, MonoSummaryUnmanagedStacks, diff --git a/msvc/Makefile.in b/msvc/Makefile.in index a35c268f47..23ce0a9ad5 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -525,8 +525,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@clean-local: +@ENABLE_MSVC_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index ef8b36062d256497bb23a354f05ec8f0ac3b4c57..8f1eef17900bb93920a68afaba86d9ee6eab21c4 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!V}s3axQw^}N>&DP delta 20 bcmbQIHBW29Q!aJ`1p^B!WAn{#xQw^}N^}Nz diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index f6e265442e..a1ab34f324 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -7abe3ecebe2f887d9af5a1f0976857d4fdef49c4 \ No newline at end of file +735fdd69a36f0602ee03a8e4e28b65dbfb174488 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 057e0dc2874f732c41779635fddd5f91e466c60e..b262ce4419bc002188bd7182a510303ee336b952 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)Uf`NsVvB73j#VK+CQFaEX delta 20 bcmX?Ef3kjqo+7(}f`NsVvH50G#VK+CQIrO* diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 20ee347004..09d573550d 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -110051a8c257e8de7d7fd58c4971f3499e334723 \ No newline at end of file +fc1cc35d4017c43733665195c297bb68a9f81c36 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 8e95ef539846cb49c5dc1d9e4f925bd9f1b2c32b..e94cc49c8b44d9e1475fcdc5a859375d35d6b565 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?1l;k7FNavoB7oXv;bhp2Lu2B delta 22 dcmeyri1Gg-#tj_m>;?)37FNdQoB7oXv;bh{2MPcH diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index ef3a00dd1e..408f3ce6d7 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -cc8ba8338d00d7ef69dada9cc41424d8c8bedb6e \ No newline at end of file +a8e3dc735a98f21265d993a4fcc630c92cb38916 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 45c2bce785..b73e7922c2 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.6.0.121\n" +"Project-Id-Version: mono 6.6.0.123\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-10-10 08:37+0000\n" +"POT-Creation-Date: 2019-10-11 08:30+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 9748193c0251d643e00f5e28c264fbc71f205678..61326778e858ebd80b5b1288e98ef722023bc382 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUb(THm6QyYzF{szX*B& delta 22 ecmaF1gXP%{mJM-J*$os7EUb*pH>XZzYzF{s-3WjH diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index f77018e6a4..4f5c98555b 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -3a9766821c65f299c79069b3eb1a97e5da4bf161 \ No newline at end of file +fbf44231cabe005a0292afafc6226fec65638ec7 \ No newline at end of file