Repo-copy existing lang/mono port to lang/mono5.10 in preparation for

switching lang/mono to a metaport.

11 files changed, 222 insertions, 0 deletions

diff --git a/lang/mono5.10/files/patch-configure.ac b/lang/mono5.10/files/patch-configure.ac
new file mode 100644
index 000000000000..280b4da2ddb1
--- /dev/null
+++ b/lang/mono5.10/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2018-04-18 10:51:42.000000000 +0300
++++ configure.ac	2018-06-24 02:38:19.860780000 +0300
+@@ -3271,6 +3271,8 @@
+ 			BTLS_PLATFORM=i386
+ 			;;
+ 		  openbsd*|freebsd*|kfreebsd-gnu*)
++			BTLS_SUPPORTED=yes
++			BTLS_PLATFORM=i386
+ 		        ;;
+ 		esac
+ 		;;
+@@ -3295,6 +3297,8 @@
+ 			boehm_supported=false
+ 			;;
+ 		  openbsd*|freebsd*|kfreebsd-gnu*)
++                        BTLS_SUPPORTED=yes
++                        BTLS_PLATFORM=x86_64
+ 			;;
+ 		  mingw*)
+ 			;;
diff --git a/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.Cryptography_KeyPairPersistence.cs b/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.Cryptography_KeyPairPersistence.cs
new file mode 100644
index 000000000000..5af30b379a35
--- /dev/null
+++ b/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.Cryptography_KeyPairPersistence.cs
@@ -0,0 +1,11 @@
+--- mcs/class/Mono.Security/Mono.Security.Cryptography/KeyPairPersistence.cs.orig	2017-07-20 18:10:59 UTC
++++ mcs/class/Mono.Security/Mono.Security.Cryptography/KeyPairPersistence.cs
+@@ -244,7 +244,7 @@ namespace Mono.Security.Cryptography {
+ 					if ((_machinePath == null) || (!_machinePathExists)) {
+ 						_machinePath = Path.Combine (
+ 							Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData),
+-							".mono");
++							"mono");
+ 						_machinePath = Path.Combine (_machinePath, "keypairs");
+ 
+ 						_machinePathExists = Directory.Exists (_machinePath);
diff --git a/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.X509_X509StoreManager.cs b/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.X509_X509StoreManager.cs
new file mode 100644
index 000000000000..9e1c62b7c5b4
--- /dev/null
+++ b/lang/mono5.10/files/patch-mcs_class_Mono.Security_Mono.Security.X509_X509StoreManager.cs
@@ -0,0 +1,20 @@
+--- mcs/class/Mono.Security/Mono.Security.X509/X509StoreManager.cs.orig	2017-07-20 18:10:59 UTC
++++ mcs/class/Mono.Security/Mono.Security.X509/X509StoreManager.cs
+@@ -73,7 +73,7 @@ namespace Mono.Security.X509 {
+ 				if (_localMachinePath == null) {
+ 					_localMachinePath = Path.Combine (
+ 						Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData),
+-						".mono");
++						"mono");
+ 					_localMachinePath = Path.Combine (_localMachinePath, "certs");
+ 				}
+ 				return _localMachinePath;
+@@ -97,7 +97,7 @@ namespace Mono.Security.X509 {
+ 				if (_newLocalMachinePath == null) {
+ 					_newLocalMachinePath = Path.Combine (
+ 						Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData),
+-						".mono");
++						"mono");
+ 					_newLocalMachinePath = Path.Combine (_newLocalMachinePath, "new-certs");
+ 				}
+ 				return _newLocalMachinePath;
diff --git a/lang/mono5.10/files/patch-mcs_tools_mono-configuration-crypto_lib_Mono.Configuration.Crypto_KeyContainerCollection.cs b/lang/mono5.10/files/patch-mcs_tools_mono-configuration-crypto_lib_Mono.Configuration.Crypto_KeyContainerCollection.cs
new file mode 100644
index 000000000000..906247de2820
--- /dev/null
+++ b/lang/mono5.10/files/patch-mcs_tools_mono-configuration-crypto_lib_Mono.Configuration.Crypto_KeyContainerCollection.cs
@@ -0,0 +1,11 @@
+--- mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto/KeyContainerCollection.cs.orig	2017-07-20 18:10:59 UTC
++++ mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto/KeyContainerCollection.cs
+@@ -32,7 +32,7 @@ namespace Mono.Configuration.Crypto
+ 			string topPath;
+ 
+ 			if (machineStore)
+-				topPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData), ".mono");
++				topPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData), "mono");
+ 			else
+ 				topPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), ".mono");
+ 			topPath = Path.Combine (topPath, "keypairs");
diff --git a/lang/mono5.10/files/patch-mcs_tools_xbuild_data_12.0_Microsoft.CSharp.targets b/lang/mono5.10/files/patch-mcs_tools_xbuild_data_12.0_Microsoft.CSharp.targets
new file mode 100644
index 000000000000..a250c6e05315
--- /dev/null
+++ b/lang/mono5.10/files/patch-mcs_tools_xbuild_data_12.0_Microsoft.CSharp.targets
@@ -0,0 +1,25 @@
+--- mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets.orig	2017-07-20 18:10:59 UTC
++++ mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets
+@@ -20,6 +20,11 @@
+ 		<NoCompilerStandardLib Condition="'$(NoCompilerStandardLib)'==''">true</NoCompilerStandardLib>
+ 	</PropertyGroup>
+ 
++	<PropertyGroup >
++		<SnToolExe>sn</SnToolExe>
++		<SnToolPath>$(CscToolPath)</SnToolPath>
++	</PropertyGroup>
++
+ 	<ItemGroup>
+ 		<DocFileItem Include="$(DocumentationFile)" Condition="'$(DocumentationFile)' != ''"/>
+ 	</ItemGroup>
+@@ -102,6 +107,10 @@
+ 			ToolExe="$(CscToolExe)"
+ 			ToolPath="$(CscToolPath)" />
+ 
++		<Exec
++			Command="$(SnToolPath)$(SnToolExe) -R @(IntermediateAssembly) $(KeyOriginatorFile)"
++			Condition="'$(DelaySign)' == '' and '$(KeyContainerName)' == '' and '$(KeyOriginatorFile)' != '' and ( $(CscToolExe.EndsWith('csc.exe')) or $(CscToolExe.EndsWith('csc')) or $(CscToolExe) == '' )" />
++
+ 	</Target>
+ 
+ 	<Target Name="CreateManifestResourceNames">
diff --git a/lang/mono5.10/files/patch-mcs_tools_xbuild_data_14.0_Microsoft.CSharp.targets b/lang/mono5.10/files/patch-mcs_tools_xbuild_data_14.0_Microsoft.CSharp.targets
new file mode 100644
index 000000000000..16ae5edd0354
--- /dev/null
+++ b/lang/mono5.10/files/patch-mcs_tools_xbuild_data_14.0_Microsoft.CSharp.targets
@@ -0,0 +1,25 @@
+--- mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets.orig	2017-07-20 18:10:59 UTC
++++ mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets
+@@ -20,6 +20,11 @@
+ 		<NoCompilerStandardLib Condition="'$(NoCompilerStandardLib)'==''">true</NoCompilerStandardLib>
+ 	</PropertyGroup>
+ 
++	<PropertyGroup >
++		<SnToolExe>sn</SnToolExe>
++		<SnToolPath>$(CscToolPath)</SnToolPath>
++	</PropertyGroup>
++
+ 	<ItemGroup>
+ 		<DocFileItem Include="$(DocumentationFile)" Condition="'$(DocumentationFile)' != ''"/>
+ 	</ItemGroup>
+@@ -102,6 +107,10 @@
+ 			ToolExe="$(CscToolExe)"
+ 			ToolPath="$(CscToolPath)" />
+ 
++		<Exec
++			Command="$(SnToolPath)$(SnToolExe) -R @(IntermediateAssembly) $(KeyOriginatorFile)"
++			Condition="'$(DelaySign)' == '' and '$(KeyContainerName)' == '' and '$(KeyOriginatorFile)' != '' and ( $(CscToolExe.EndsWith('csc.exe')) or $(CscToolExe.EndsWith('csc')) or $(CscToolExe) == '' )" />
++
+ 	</Target>
+ 
+ 	<Target Name="CreateManifestResourceNames">
diff --git a/lang/mono5.10/files/patch-mono_eglib_gfile-posix.c b/lang/mono5.10/files/patch-mono_eglib_gfile-posix.c
new file mode 100644
index 000000000000..51b4c84fa1f4
--- /dev/null
+++ b/lang/mono5.10/files/patch-mono_eglib_gfile-posix.c
@@ -0,0 +1,11 @@
+--- mono/eglib/gfile-posix.c.orig        2018-01-10 08:03:25 UTC
++++ mono/eglib/gfile-posix.c
+@@ -161,7 +161,7 @@ g_get_current_dir (void)
+ 	do {
+ 		buffer = g_realloc (buffer, s);
+ 		r = getcwd (buffer, s);
+-		fail = (r == NULL && errno == ERANGE);
++		fail = (r == NULL && (errno == ERANGE || errno == 0));
+ 		if (fail) {
+ 			s <<= 1;
+ 		}
diff --git a/lang/mono5.10/files/patch-mono_mini_tramp-amd64.c b/lang/mono5.10/files/patch-mono_mini_tramp-amd64.c
new file mode 100644
index 000000000000..c09b13cf0fec
--- /dev/null
+++ b/lang/mono5.10/files/patch-mono_mini_tramp-amd64.c
@@ -0,0 +1,26 @@
+--- mono/mini/tramp-amd64.c.orig	2018-04-13 23:37:57 UTC
++++ mono/mini/tramp-amd64.c
+@@ -363,7 +363,11 @@ mono_arch_create_generic_trampoline (Mon
+ 	}
+ 	for (i = 0; i < AMD64_XMM_NREG; ++i)
+ 		if (AMD64_IS_ARGUMENT_XREG (i))
++#if defined(MONO_HAVE_SIMD_REG)
+ 			amd64_movdqu_membase_reg (code, AMD64_RBP, saved_fpregs_offset + (i * sizeof(MonoContextSimdReg)), i);
++#else
++			amd64_movsd_membase_reg (code, AMD64_RBP, saved_fpregs_offset + (i * sizeof(double)), i);
++#endif
+ 
+ 	/* Check that the stack is aligned */
+ 	amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, sizeof (mgreg_t));
+@@ -540,7 +544,11 @@ mono_arch_create_generic_trampoline (Mon
+ 			amd64_mov_reg_membase (code, i, AMD64_RBP, saved_regs_offset + (i * sizeof(mgreg_t)), sizeof(mgreg_t));
+ 	for (i = 0; i < AMD64_XMM_NREG; ++i)
+ 		if (AMD64_IS_ARGUMENT_XREG (i))
++#if defined(MONO_HAVE_SIMD_REG)
+ 			amd64_movdqu_reg_membase (code, i, AMD64_RBP, saved_fpregs_offset + (i * sizeof(MonoContextSimdReg)));
++#else
++			amd64_movsd_reg_membase (code, i, AMD64_RBP, saved_fpregs_offset + (i * sizeof(double)));
++#endif
+ 
+ 	/* Restore stack */
+ #if TARGET_WIN32
diff --git a/lang/mono5.10/files/patch-mono_utils_mono-context.h b/lang/mono5.10/files/patch-mono_utils_mono-context.h
new file mode 100644
index 000000000000..e08b5ea2e9b7
--- /dev/null
+++ b/lang/mono5.10/files/patch-mono_utils_mono-context.h
@@ -0,0 +1,42 @@
+--- mono/utils/mono-context.h.orig	2018-04-13 23:37:57 UTC
++++ mono/utils/mono-context.h
+@@ -24,23 +24,30 @@
+ 
+ #if defined(TARGET_X86)
+ #if defined(__APPLE__)
++#define MONO_HAVE_SIMD_REG
+ typedef struct __darwin_xmm_reg MonoContextSimdReg;
+ #endif
+ #elif defined(TARGET_AMD64)
+ #if defined(__APPLE__)
++#define MONO_HAVE_SIMD_REG
+ typedef struct __darwin_xmm_reg MonoContextSimdReg;
+ #elif defined(__linux__) && defined(__GLIBC__)
++#define MONO_HAVE_SIMD_REG
+ typedef struct _libc_xmmreg MonoContextSimdReg;
+ #elif defined(HOST_WIN32)
++#define MONO_HAVE_SIMD_REG
+ #include <emmintrin.h>
+ typedef __m128d MonoContextSimdReg;
+ #elif defined(HOST_ANDROID)
++#define MONO_HAVE_SIMD_REG
+ typedef struct _libc_xmmreg MonoContextSimdReg;
+ #elif defined(__linux__)
++#define MONO_HAVE_SIMD_REG
+ #include <emmintrin.h>
+ typedef __m128d MonoContextSimdReg;
+ #endif
+ #elif defined(TARGET_ARM64)
++#define MONO_HAVE_SIMD_REG
+ typedef __uint128_t MonoContextSimdReg;
+ #endif
+ 
+@@ -255,7 +262,7 @@ typedef struct {
+ 
+ typedef struct {
+ 	mgreg_t gregs [AMD64_NREG];
+-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || defined(HOST_WIN32)
++#if defined(MONO_HAVE_SIMD_REG)
+ 	MonoContextSimdReg fregs [AMD64_XMM_NREG];
+ #else
+ 	double fregs [AMD64_XMM_NREG];
diff --git a/lang/mono5.10/files/patch-mono_utils_mono-threads.c b/lang/mono5.10/files/patch-mono_utils_mono-threads.c
new file mode 100644
index 000000000000..31b798b128e2
--- /dev/null
+++ b/lang/mono5.10/files/patch-mono_utils_mono-threads.c
@@ -0,0 +1,20 @@
+--- mono/utils/mono-threads.c.orig	2018-04-13 23:37:57 UTC
++++ mono/utils/mono-threads.c
+@@ -1316,7 +1316,7 @@ mono_thread_info_sleep (guint32 ms, gboo
+ 		} while (1);
+ 	} else {
+ 		int ret;
+-#if defined (__linux__) && !defined(HOST_ANDROID)
++#if defined (HAVE_CLOCK_NANOSLEEP) && !defined(HOST_ANDROID)
+ 		struct timespec start, target;
+ 
+ 		/* Use clock_nanosleep () to prevent time drifting problems when nanosleep () is interrupted by signals */
+@@ -1346,7 +1346,7 @@ mono_thread_info_sleep (guint32 ms, gboo
+ 			memset (&rem, 0, sizeof (rem));
+ 			ret = nanosleep (&req, &rem);
+ 		} while (ret != 0);
+-#endif /* __linux__ */
++#endif /* HAVE_CLOCK_NANOSLEEP */
+ 	}
+ 
+ 	MONO_EXIT_GC_SAFE;
diff --git a/lang/mono5.10/files/patch-scripts_mono-heapviz b/lang/mono5.10/files/patch-scripts_mono-heapviz
new file mode 100644
index 000000000000..fc44982f44f8
--- /dev/null
+++ b/lang/mono5.10/files/patch-scripts_mono-heapviz
@@ -0,0 +1,11 @@
+--- scripts/mono-heapviz.orig	2018-01-18 17:41:54 UTC
++++ scripts/mono-heapviz
+@@ -7,7 +7,7 @@
+ 
+ from __future__ import print_function
+ import sys, os
+-import Image, ImageDraw
++from PIL import Image, ImageDraw
+ from xml.sax import ContentHandler, make_parser
+ from xml.sax.handler import feature_namespaces
+ from optparse import OptionParser