Merge branch 'upstream'

Former-commit-id: 25a260452f416d8aa2fc1c9a8f0f5a593c593102
2018-03-21 09:37:42 +00:00 · 2018-03-21 09:37:42 +00:00 · f0952ad113
commit f0952ad113
parent c71ea411d1 f86206848c
37 changed files with 45 additions and 108 deletions
--- a/config.h.in
+++ b/config.h.in
@ -219,12 +219,6 @@
 /* Use classic Windows API support */
 #undef HAVE_CLASSIC_WINAPI_SUPPORT

-/* CLOCK_MONOTONIC */
-#undef HAVE_CLOCK_MONOTONIC
-
-/* CLOCK_MONOTONIC_COARSE */
-#undef HAVE_CLOCK_MONOTONIC_COARSE
-
 /* Define to 1 if you have the `clock_nanosleep' function. */
 #undef HAVE_CLOCK_NANOSLEEP

@ -389,9 +383,6 @@
 /* Define to 1 if you have the `gethostid' function. */
 #undef HAVE_GETHOSTID

-/* gethrtime */
-#undef HAVE_GETHRTIME
-
 /* Have getifaddrs */
 #undef HAVE_GETIFADDRS

@ -542,9 +533,6 @@
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #undef HAVE_MACHINE_ENDIAN_H

-/* mach_absolute_time */
-#undef HAVE_MACH_ABSOLUTE_TIME
-
 /* Define to 1 if you have the `madvise' function. */
 #undef HAVE_MADVISE

@ -669,9 +657,6 @@
 /* Define to 1 if you have the `readv' function. */
 #undef HAVE_READV

-/* read_real_time */
-#undef HAVE_READ_REAL_TIME
-
 /* Define to 1 if you have the `remap_file_pages' function. */
 #undef HAVE_REMAP_FILE_PAGES

--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-076c7f7ea710f371f2b456306d293464fb64345c
+8a49b44278fc8f5f287833024b38e31783fab28b
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-3dfc7bdce20df1f718af232b5a9e164e9cbc125c
+c67a9efcce1d756bd7755aae18cce1416c49542d
--- 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.1.2";
+	public const string MonoVersion = "5.10.1.4";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-782ff3108fa8594e8f79418d1c0a5493c1f41b9e
+632ffa63e9d733d1fa7e85288e669c7f3c0a961a
--- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-397304064b2cf8faea733540adc178294323fa7c
+74210b34f12491fef9f55d7f8c9ed8fc29d01a37
--- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea
+82f130c85c572806b2dfd30c0406a671d5821476
--- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-b13ba9b6351fc5188afd7b6f83a6a9c0a4844730
+c5c35be810d44e629cfde3a5bb1a7f349529711d
--- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-00489f90d93ff78c4a085a84390061140e81a9af
+c16b35960e6d2f8cf7297971db20ee4d6505166b
--- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-a43fee480db4e61c27d272bea6ba535d161d1cc2
+aad7272a54bf569f27d3bc8484f8656d648a1111
--- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f
+5a49425c0eec7a0194b51366746eed914c57f302
--- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-782ff3108fa8594e8f79418d1c0a5493c1f41b9e
+632ffa63e9d733d1fa7e85288e669c7f3c0a961a
--- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-397304064b2cf8faea733540adc178294323fa7c
+74210b34f12491fef9f55d7f8c9ed8fc29d01a37
--- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea
+82f130c85c572806b2dfd30c0406a671d5821476
--- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-b13ba9b6351fc5188afd7b6f83a6a9c0a4844730
+c5c35be810d44e629cfde3a5bb1a7f349529711d
--- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-00489f90d93ff78c4a085a84390061140e81a9af
+c16b35960e6d2f8cf7297971db20ee4d6505166b
--- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-a43fee480db4e61c27d272bea6ba535d161d1cc2
+aad7272a54bf569f27d3bc8484f8656d648a1111
--- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f
+5a49425c0eec7a0194b51366746eed914c57f302
--- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-782ff3108fa8594e8f79418d1c0a5493c1f41b9e
+632ffa63e9d733d1fa7e85288e669c7f3c0a961a
--- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-397304064b2cf8faea733540adc178294323fa7c
+74210b34f12491fef9f55d7f8c9ed8fc29d01a37
--- a/Show More
+++ b/Show More