Merge pull request #1309 from Unity-Technologies/mac-arm64

Add Apple silicon slice to Mono runtime built for macOS

Author: TautvydasZilys

configure.ac

@@ -355,6 +355,9 @@ case "$host" in
 				platform_ios=yes
 				has_dtrace=no
 				;;
+			aarch64*-darwinmacos*)
+				support_boehm=no
+				;;
 			aarch64*-darwin*)
 				platform_ios=yes
 				;;
@@ -1617,22 +1620,27 @@ if test x$host_win32 = xno; then
 		LIBS="$LIBS $DL_LIB"
 		AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available])
 		dnl from glib's configure.ac
-		AC_CACHE_CHECK([for preceeding underscore in symbols],
-			mono_cv_uscore,[
-			AC_TRY_RUN([#include <dlfcn.h>
-			int mono_underscore_test (void) { return 42; }
-			int main() {
-			  void *f1 = (void*)0, *f2 = (void*)0, *handle;
-			  handle = dlopen ((void*)0, 0);
-			  if (handle) {
-			    f1 = dlsym (handle, "mono_underscore_test");
-			    f2 = dlsym (handle, "_mono_underscore_test");
-			  } return (!f2 || f1);
-			}],
+		if test "x$cross_compiling" = "xyes"; then
+		   AC_MSG_RESULT(cross compiling, assuming no)
+		   mono_cv_uscore=no
+		else
+			AC_CACHE_CHECK([for preceeding underscore in symbols],
+			  mono_cv_uscore,[
+			  AC_TRY_RUN([#include <dlfcn.h>
+			  int mono_underscore_test (void) { return 42; }
+			  int main() {
+			    void *f1 = (void*)0, *f2 = (void*)0, *handle;
+			    handle = dlopen ((void*)0, 0);
+			    if (handle) {
+			      f1 = dlsym (handle, "mono_underscore_test");
+			      f2 = dlsym (handle, "_mono_underscore_test");
+			    } return (!f2 || f1);
+			  }],
 				[mono_cv_uscore=yes],
 				[mono_cv_uscore=no],
-			[])
-		])
+			  [])
+		  ])
+		fi
 		if test "x$mono_cv_uscore" = "xyes"; then
 			MONO_DL_NEED_USCORE=1
 		else
@@ -3434,6 +3442,16 @@ case "$host" in
 		ACCESS_UNALIGNED="no"
 		CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
 		;;
+	aarch64-*-darwinmacos*)
+		TARGET_SYS=MACOS
+		TARGET=ARM64
+		arch_target=arm64
+		boehm_supported=false
+		AOT_SUPPORTED="yes"
+		BTLS_SUPPORTED=yes
+		BTLS_PLATFORM=aarch64
+		AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no])
+		;;
 	aarch64-*)
 		# https://lkml.org/lkml/2012/7/15/133
 		TARGET=ARM64
@@ -3727,8 +3745,8 @@ if test "x$target_mach" = "xyes"; then
 	  CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
 	  CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
 	  BTLS_SUPPORTED=no
-   elif test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
-   	  AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
+   elif test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64" -a "x$TARGET_SYS" != "xMACOS"; then
+	  AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
 	  CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
 	  CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
 	  BTLS_SUPPORTED=no

external/buildscripts/Build.bee.cs

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

external/buildscripts/build.pl

@@ -4,14 +4,16 @@
 use File::Basename;
 use File::Path;
 use lib ('external/buildscripts', "../../Tools/perl_lib","perl_lib", 'external/buildscripts/perl_lib');
+use strict;
+use warnings;
 use Tools qw(InstallNameTool);
 
 print ">>> PATH in Build All = $ENV{PATH}\n\n";
 
 my $currentdir = getcwd();
 
 my $monoroot = File::Spec->rel2abs(dirname(__FILE__) . "/../..");
-my $monoroot = abs_path($monoroot);
+$monoroot = abs_path($monoroot);
 
 my $buildscriptsdir = "$monoroot/external/buildscripts";
 my $addtoresultsdistdir = "$buildscriptsdir/add_to_build_results/monodistribution";
@@ -50,6 +52,7 @@
 my $existingMonoRootPath = '';
 my $sdk = '';
 my $arch32 = 0;
+my $targetArch = "";
 my $winPerl = "";
 my $winMonoRoot = "";
 my $msBuildVersion = "14.0";
@@ -95,6 +98,7 @@
 	'runtimetests=i'=>\$runRuntimeTests,
 	'classlibtests=i'=>\$runClasslibTests,
 	'arch32=i'=>\$arch32,
+	'targetarch=s'=>\$targetArch,
 	'jobs=i'=>\$jobs,
 	'sdk=s'=>\$sdk,
 	'existingmono=s'=>\$existingMonoRootPath,
@@ -204,10 +208,16 @@
 }
 elsif($^O eq 'darwin')
 {
-	$monoHostArch = $arch32 ? "i386" : "x86_64";
+	$monoHostArch = "x86_64";
 	$existingExternalMono = "$existingExternalMonoRoot";
 	$existingExternalMonoBinDir = "bin";
 
+	if ($targetArch eq "arm64")
+	{
+		$disableMcs = 1;
+		$test = 0;
+	}
+
 	# From Massi: I was getting failures in install_name_tool about space
 	# for the commands being too small, and adding here things like
 	# $ENV{LDFLAGS} = '-headerpad_max_install_names' and
@@ -294,7 +304,7 @@
 			}
 			else
 			{
-				if (not $checkoutonthefly)
+				if (not $checkoutOnTheFly)
 				{
 					print(">>> No external build deps found.  Might as well try to check them out.  If it fails, we'll continue and trust mono is in your PATH\n");
 				}
@@ -445,22 +455,12 @@
 	}
 
 	my $macSdkPath = "";
-	my $macversion = '10.8';
+	my $macversion = '10.12';
 	my $darwinVersion = "10";
 	if ($^O eq 'darwin')
 	{
-		if ($sdk eq '')
-		{
-			$sdk='10.11';
-		}
-
-		my $macBuildEnvDir = "$externalBuildDeps/MacBuildEnvironment";
-		$macSdkPath = "$macBuildEnvDir/builds/MacOSX$sdk.sdk";
-		if (! -d $macSdkPath)
-		{
-			print(">>> Unzipping mac build toolchain\n");
-			system("unzip", '-qd', "$macBuildEnvDir", "$macBuildEnvDir/builds.zip") eq 0 or die ("failed unzipping mac build toolchain\n");
-		}
+		$sdk='11.0';
+		$macSdkPath = "$externalBuildDeps/mac-toolchain-11_0/MacOSX$sdk.sdk";
 	}
 
 	if ($iphone || $iphoneSimulator)
@@ -681,7 +681,6 @@
 		my $platformRootPostfix = "";
 		my $useKraitPatch = 1;
 		my $kraitPatchPath = "$monoroot/../../android_krait_signal_handler/build";
-		my $toolChainExtension = "";
 
 		$ENV{ANDROID_PLATFORM} = "android-$apiLevel";
 
@@ -759,8 +758,6 @@
 
 		if ($runningOnWindows)
 		{
-			$toolChainExtension = ".exe";
-
 			$androidPlatformRoot = `cygpath -w $androidPlatformRoot`;
 			# clean up trailing new lines that end up in the output from cygpath.
 			$androidPlatformRoot =~ s/\n+$//;
@@ -968,8 +965,6 @@
 
 		if ($runningOnWindows)
 		{
-			$toolChainExtension = ".exe";
-
 			$tizenPlatformRoot = `cygpath -w $tizenPlatformRoot`;
 			# clean up trailing new lines that end up in the output from cygpath.
 			$tizenPlatformRoot =~ s/\n+$//;
@@ -1159,20 +1154,37 @@
 			$existingMonoRootPath = "$monoInstalls/$monoVersionToUse";
 		}
 
+		if ($targetArch eq "arm64")
+		{
+			$macversion = "11.0"; # To build on ARM64, we need to specify min OS version as 11.0 as we need to use new APIs from 11.0
+		}
+
 		$mcs = "EXTERNAL_MCS=$existingMonoRootPath/bin/mcs";
 
 		$ENV{'CC'} = "$macSdkPath/../usr/bin/clang";
 		$ENV{'CXX'} = "$macSdkPath/../usr/bin/clang++";
-		$ENV{'CFLAGS'} = $ENV{MACSDKOPTIONS} = "-D_XOPEN_SOURCE -I$macBuildEnvDir/builds/usr/include -mmacosx-version-min=$macversion -isysroot $macSdkPath";
+		$ENV{'CFLAGS'} = $ENV{MACSDKOPTIONS} = "-mmacosx-version-min=$macversion -isysroot $macSdkPath -g";
 
-		$ENV{CFLAGS} = "$ENV{CFLAGS} -g -O0" if $debug;
+		$ENV{CFLAGS} = "$ENV{CFLAGS} -O0" if $debug;
 		$ENV{CFLAGS} = "$ENV{CFLAGS} -Os" if not $debug; #optimize for size
 
-		$ENV{CC} = "$ENV{CC} -arch $monoHostArch";
-		$ENV{CXX} = "$ENV{CXX} -arch $monoHostArch";
+		$ENV{CC} = "$ENV{CC} -arch $targetArch";
+		$ENV{CXX} = "$ENV{CXX} -arch $targetArch";
 
 		# Add OSX specific autogen args
-		push @configureparams, "--host=$monoHostArch-apple-darwin12.2.0";
+
+		if ($targetArch eq "x86_64")
+		{
+			push @configureparams, "--host=x86_64-apple-darwin12.2.0";
+		}
+		elsif ($targetArch eq "arm64")
+		{
+			push @configureparams, "--host=aarch64-apple-darwinmacos12.2.0";
+		}
+		else
+		{
+			die("Unsupported macOS architecture: $targetArch");
+		}
 
 		# Need to define because Apple's SIP gets in the way of us telling mono where to find this
 		push @configureparams, "--with-libgdiplus=$addtoresultsdistdir/lib/libgdiplus.dylib";
@@ -1510,10 +1522,9 @@
 	}
 	elsif($^O eq 'darwin')
 	{
-		# Note these tmp directories will get merged into a single 'osx' directory later by a parent script
-		$embedDirArchDestination = "$embedDirRoot/osx-tmp-$monoHostArch";
-		$distDirArchBin = "$distdir/bin-osx-tmp-$monoHostArch";
-		$versionsOutputFile = $arch32 ? "$buildsroot/versions-osx32.txt" : "$buildsroot/versions-osx64.txt";
+		$embedDirArchDestination = "$embedDirRoot/osx-tmp-$targetArch";
+		$distDirArchBin = "$distdir/bin-osx-tmp-$targetArch";
+		$versionsOutputFile = "$buildsroot/versions-macos-$targetArch.txt";
 	}
 	else
 	{
@@ -1598,7 +1609,7 @@
 			system("ln","-f", "$monoroot/mono/mini/.libs/libmonosgen-2.0.dylib","$embedDirArchDestination/libmonosgen-2.0.dylib") eq 0 or die ("failed symlinking libmonosgen-2.0.dylib\n");
 
 			print "Hardlinking libMonoPosixHelper.dylib\n";
-			system("ln","-f", "$monoroot/support/.libs/libMonoPosixHelper.dylib","$embedDirArchDestination/libMonoPosixHelper.dylib") eq 0 or die ("failed symlinking $libtarget/libMonoPosixHelper.dylib\n");
+			system("ln","-f", "$monoroot/support/.libs/libMonoPosixHelper.dylib","$embedDirArchDestination/libMonoPosixHelper.dylib") eq 0 or die ("failed symlinking $embedDirArchDestination/libMonoPosixHelper.dylib\n");
 
 			InstallNameTool("$embedDirArchDestination/libmonobdwgc-2.0.dylib", "\@executable_path/../Frameworks/MonoEmbedRuntime/osx/libmonobdwgc-2.0.dylib");
 			InstallNameTool("$embedDirArchDestination/libmonosgen-2.0.dylib", "\@executable_path/../Frameworks/MonoEmbedRuntime/osx/libmonosgen-2.0.dylib");
@@ -1691,9 +1702,9 @@
 
 if ($test)
 {
+	my $runtimeTestsDir = "$monoroot/mono/mini";
 	if ($runRuntimeTests)
 	{
-		my $runtimeTestsDir = "$monoroot/mono/mini";
 		chdir("$runtimeTestsDir") eq 1 or die ("failed to chdir");
 		print("\n>>> Calling make check in $runtimeTestsDir\n\n");
 		system("make","check") eq 0 or die ("runtime tests failed\n");
@@ -1727,4 +1738,4 @@
 	print(">>> Skipping unit tests\n");
 }
 
-chdir ($currentdir);
+chdir ($currentdir);