Merge branch 'upstream'

Former-commit-id: 7cf5c32514e4f4c0e749d04dce17f2467c07856b
2018-03-16 08:50:43 +00:00 · 2018-03-16 08:50:43 +00:00 · 78943467d3
commit 78943467d3
parent 611d231a38 0eb07a23ab
36 changed files with 107 additions and 38 deletions
--- a/config.h.in
+++ b/config.h.in
@ -219,6 +219,12 @@
 /* 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

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

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

@ -533,6 +542,9 @@
 /* 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

@ -657,6 +669,9 @@
 /* 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 @@
-9774f14a084c7940953e8aa66678e69a2f477362
+65c2b7afb2139236b5a126aef6305884e188c3fa
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-957cb149fe4cc671a3dc90079b0db6edbe6c323c
+b7e93aad1f52da63e7269ccaa0e73d452eff9124
--- 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.176";
+	public const string MonoVersion = "5.10.0.178";
 	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 @@
-06926744392e85001870650a3a257006a0e76492
+9847362daff6478b1edf20438f9b2a8bfc900583
--- 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 @@
-d3f4cd77dc60ca7c340191278359f61b823c8607
+f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
--- 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 @@
-982f8c43712ec5333cc3acb603344267a51b8d1d
+5debb727a120862b6c76cda3a9a16e1f8361d9d4
--- 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 @@
-896a1e419453152496e2d64acce1175ce2897a2a
+ee4a72daf6c384947b1274da57d0ef971ed4a550
--- 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 @@
-0394570fb69b53a0aa3eea23e6b750f5b746024e
+e0556af7c76bba7d4b418d710858aaa21ae1643e
--- 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 @@
-b9a5181cb8d8405bb006a98f4d5497fef0aedf21
+2e7a08ba7258340ed503ab6dde8a74952e161525
--- 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 @@
-18fec44a585ccb0719117b956086dfe7fb9177b8
+01589d9c2ce85ea1d816ff6911422c3db7c9653d
--- 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 @@
-06926744392e85001870650a3a257006a0e76492
+9847362daff6478b1edf20438f9b2a8bfc900583
--- 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 @@
-d3f4cd77dc60ca7c340191278359f61b823c8607
+f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
--- 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 @@
-982f8c43712ec5333cc3acb603344267a51b8d1d
+5debb727a120862b6c76cda3a9a16e1f8361d9d4
--- 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 @@
-896a1e419453152496e2d64acce1175ce2897a2a
+ee4a72daf6c384947b1274da57d0ef971ed4a550
--- 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 @@
-0394570fb69b53a0aa3eea23e6b750f5b746024e
+e0556af7c76bba7d4b418d710858aaa21ae1643e
--- 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 @@
-b9a5181cb8d8405bb006a98f4d5497fef0aedf21
+2e7a08ba7258340ed503ab6dde8a74952e161525
--- 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 @@
-18fec44a585ccb0719117b956086dfe7fb9177b8
+01589d9c2ce85ea1d816ff6911422c3db7c9653d
--- 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 @@
-06926744392e85001870650a3a257006a0e76492
+9847362daff6478b1edf20438f9b2a8bfc900583
--- 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 @@
-d3f4cd77dc60ca7c340191278359f61b823c8607
+f9feb988dc0a4d8c01ace8978dd6a30127f1a6fa
--- a/Show More
+++ b/Show More