Merge pull request #1346 from Unity-Technologies/apple-silicon-fixes

Fix JIT on macOS Big Sur beta 6 when running on Apple silicon

Author: TautvydasZilys

external/buildscripts/Build.bee.cs

@@ -75,7 +75,7 @@ private static void RegisterOSXArtifacts()
 
 			Artifacts.Add("MacBuildEnvironment",
 				new Tuple<string, string>(
-					"mac-toolchain-11_0/12.0-12A8158a_2b346a6c93e9c82250a1d88c02f24a5dea9f0bd1aa2ef44109896a44800e8c68.zip",
+					"mac-toolchain-11_0/12.2-12B5018i_351c773fb8a192039fe0f0e962314b888102b0718c734ad54f3906c0caeed1c9.zip",
 					"unity-internal"));
 
 			Artifacts.Add("mono-build-tools-extra",

external/buildscripts/build_all_osx.pl

@@ -110,7 +110,7 @@
 
 	for my $file ('mono')
 	{
-		MergeIntoFatBinary("$distDirSourceBinX64/$file", "$distDirSourceBinARM64/$file", "$distDirDestinationBin/$file");
+		MergeIntoFatBinary("$distDirSourceBinX64/$file", "$distDirSourceBinARM64/$file", "$distDirDestinationBin/$file", 1);
 	}
 
 	for my $file ('pedump')
@@ -126,7 +126,7 @@
 
 	for my $file ('libMonoPosixHelper.dylib')
 	{
-		MergeIntoFatBinary("$embedDirSourceX64/$file", "$embedDirSourceARM64/$file", "$distDirDestinationLib/$file");
+		MergeIntoFatBinary("$embedDirSourceX64/$file", "$embedDirSourceARM64/$file", "$distDirDestinationLib/$file", 0);
 	}
 
 	if ($buildMachine)
@@ -174,8 +174,17 @@ sub CopyEmbedRuntimeBinaries
 
 sub MergeIntoFatBinary
 {
-	my ($binary1, $binary2, $binaryOutput) = @_;
+	my ($binary1, $binary2, $binaryOutput, $isExe) = @_;
 
 	print(">>> Merging '$binary1' and '$binary2' into '$binaryOutput'\n\n");
 	system('lipo', "$binary1", "$binary2", "-create", "-output", "$binaryOutput") eq 0 or die("Failed to run lipo!");
-}
+
+	if ($isExe)
+	{
+		system("codesign", "--entitlements", $buildscriptsdir . "/entitlements.plist", "-s", "-", "$binaryOutput") eq 0 or die("Failed to codesign $binaryOutput!");
+	}
+	else
+	{
+		system("codesign", "-s", "-", "$binaryOutput") eq 0 or die("Failed to codesign $binaryOutput!");
+	}
+}

external/buildscripts/entitlements.plist

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+</dict>
+</plist>
+

mono/utils/dlmalloc.c

@@ -1314,7 +1314,14 @@ extern void*     sbrk(ptrdiff_t);
 #define MAP_ANONYMOUS        MAP_ANON
 #endif /* MAP_ANON */
 #ifdef MAP_ANONYMOUS
+
+#if defined(__APPLE__) && defined(__arm64__)
+/* macOS on ARM64 requires using MAP_JIT in order to allocate executable memory. */
+#define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS|MAP_JIT)
+#else
 #define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS)
+#endif
+
 #define CALL_MMAP(s)         mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
 #else /* MAP_ANONYMOUS */
 /*

mono/utils/mono-mmap.c

@@ -228,6 +228,13 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type)
 	mflags |= MAP_ANONYMOUS;
 	mflags |= MAP_PRIVATE;
 
+#if defined(__APPLE__) && defined(__arm64__)
+	/* macOS on ARM64 requires using MAP_JIT in order
+	   to allocate executable memory. */
+	if (type == MONO_MEM_ACCOUNT_CODE)
+		mflags |= MAP_JIT;
+#endif
+
 	BEGIN_CRITICAL_SECTION;
 	ptr = mmap (addr, length, prot, mflags, -1, 0);
 	if (ptr == MAP_FAILED) {