Add support for building and using Mac Catalyst offsets (#52777)

* Add support for building Mac Catalyst offsets, and use to create AOT compiler nupkgs
dotnet · May 18, 2021 · 837605b · 837605b
1 parent 0df29f7
commit 837605b
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 3 deletions.
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -222,7 +222,7 @@
   </ItemGroup>
 
   <!-- Mono sets -->
-  <ItemGroup Condition="$(_subset.Contains('+mono.llvm+')) or $(_subset.Contains('+mono.aotcross+')) or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">
+  <ItemGroup Condition="$(_subset.Contains('+mono.llvm+')) or $(_subset.Contains('+mono.aotcross+')) or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">
     <ProjectToBuild Include="$(MonoProjectRoot)llvm\llvm-init.proj" Category="mono" />
   </ItemGroup>
 

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
@@ -154,6 +154,7 @@ stages:
       - Browser_wasm
       - tvOS_arm64
       - iOS_arm64
+      - MacCatalyst_x64
 
   #
   # Build Mono release AOT cross-compilers
@@ -213,19 +214,21 @@ stages:
       - OSX_x64
       jobParameters:
         buildArgs: -s mono+packs -c $(_BuildConfig)
-                   /p:MonoCrossAOTTargetOS=Android+Browser+tvOS+iOS /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
+                   /p:MonoCrossAOTTargetOS=Android+Browser+tvOS+iOS+MacCatalyst /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true
         nameSuffix: CrossAOT_Mono
         runtimeVariant: crossaot
         dependsOn:
         - mono_android_offsets
         - mono_browser_offsets
         - mono_tvos_offsets
         - mono_ios_offsets
+        - mono_maccatalyst_offsets
         monoCrossAOTTargetOS:
         - Android
         - Browser
         - tvOS
         - iOS
+        - MacCatalyst
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
         extraStepsParameters:

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -208,6 +208,7 @@ jobs:
     - Browser_wasm
     - tvOS_arm64
     - iOS_arm64
+    - MacCatalyst_x64
     jobParameters:
       condition: >-
         or(
@@ -561,11 +562,13 @@ jobs:
       - mono_browser_offsets
       - mono_tvos_offsets
       - mono_ios_offsets
+      - mono_maccatalyst_offsets
       monoCrossAOTTargetOS:
       - Android
       - Browser
       - tvOS
       - iOS
+      - MacCatalyst
       condition: >-
         or(
           eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj
@@ -6,6 +6,7 @@
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+browser+'))">$(MonoAotTargets);browser-wasm</MonoAotTargets>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+tvos+'))">$(MonoAotTargets);tvossimulator-x64;tvossimulator-arm64;tvos-arm64</MonoAotTargets>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+ios+'))">$(MonoAotTargets);iossimulator-x64;iossimulator-arm64;iossimulator-x86;ios-arm64;ios-arm</MonoAotTargets>
+    <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+maccatalyst+'))">$(MonoAotTargets);maccatalyst-x64;maccatalyst-arm64</MonoAotTargets>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
@@ -157,6 +157,14 @@ if(NOT AOT_TARGET_TRIPLE STREQUAL "")
   elseif(AOT_TARGET_TRIPLE STREQUAL "arm-apple-darwin10")
     set(TARGET_SYSTEM_NAME "iOS")
     set(TARGET_ARCH "arm")
+  elseif(AOT_TARGET_TRIPLE STREQUAL "x86_64-apple-maccatalyst")
+    set(TARGET_SYSTEM_NAME "Darwin")
+    set(TARGET_ARCH "x86_64")
+    set(CMAKE_SYSTEM_VARIANT "MacCatalyst")
+  elseif(AOT_TARGET_TRIPLE STREQUAL "aarch64-apple-maccatalyst")
+    set(TARGET_SYSTEM_NAME "Darwin")
+    set(TARGET_ARCH "arm64")
+    set(CMAKE_SYSTEM_VARIANT "MacCatalyst")
   elseif(AOT_TARGET_TRIPLE STREQUAL "wasm32-unknown-none")
     set(TARGET_SYSTEM_NAME "Emscripten")
     set(TARGET_ARCH "wasm")

diff --git a/src/mono/cmake/config.h.in b/src/mono/cmake/config.h.in
@@ -893,6 +893,9 @@
 /* The JIT/AOT targets tvOS */
 #cmakedefine TARGET_TVOS 1
 
+/* The JIT/AOT targets Mac Catalyst */
+#cmakedefine TARGET_MACCAT 1
+
 /* The JIT/AOT targets OSX */
 #cmakedefine TARGET_OSX 1
 

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
@@ -50,6 +50,7 @@
     <BuildMonoAOTCrossCompiler Condition="'$(TargetsAndroid)' == 'true'">true</BuildMonoAOTCrossCompiler>
     <MonoAOTEnableLLVM Condition="'$(TargetsiOS)' == 'true'">true</MonoAOTEnableLLVM>
     <MonoAOTEnableLLVM Condition="'$(TargetstvOS)' == 'true'">true</MonoAOTEnableLLVM>
+    <MonoAOTEnableLLVM Condition="'$(TargetsMacCatalyst)' == 'true'">true</MonoAOTEnableLLVM>
     <MonoAOTEnableLLVM Condition="'$(TargetsBrowser)' == 'true'">true</MonoAOTEnableLLVM>
     <MonoAOTEnableLLVM Condition="'$(TargetsAndroid)' == 'true'">true</MonoAOTEnableLLVM>
     <MonoObjCrossDir>$([MSBuild]::NormalizeDirectory('$(MonoObjDir)', 'cross'))</MonoObjCrossDir>
@@ -498,7 +499,14 @@
       <MonoAotAbi Condition="'$(Platform)' == 'x86'">i386-apple-darwin10</MonoAotAbi>
       <MonoAotAbi Condition="'$(Platform)' == 'x64'">x86_64-apple-darwin10</MonoAotAbi>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true'">
+    <PropertyGroup Condition="'$(TargetsMacCatalyst)' == 'true'">
+      <MonoUseCrossTool>true</MonoUseCrossTool>
+      <MonoAotCMakeSysroot Condition="'$(TargetsMacCatalyst)' == 'true'">$(XcodeDir)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk</MonoAotCMakeSysroot>
+      <MonoAotOffsetsFile>$(MonoObjCrossDir)offsets-$(Platform)-darwin.h</MonoAotOffsetsFile>
+      <MonoAotAbi Condition="'$(Platform)' == 'arm64'">aarch64-apple-maccatalyst</MonoAotAbi>
+      <MonoAotAbi Condition="'$(Platform)' == 'x64'">x86_64-apple-maccatalyst</MonoAotAbi>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsMacCatalyst)' == 'true'">
       <MonoAOTCMakeArgs Include="-DCMAKE_OSX_DEPLOYMENT_TARGET=$(macOSVersionMin)" />
     </ItemGroup>
 

diff --git a/src/mono/mono/tools/offsets-tool/offsets-tool.py b/src/mono/mono/tools/offsets-tool/offsets-tool.py
@@ -155,6 +155,19 @@ def require_emscipten_path (args):
 			self.target_args += ["-arch", "x86_64"]
 			self.target_args += ["-isysroot", args.sysroot]
 
+		# MacCatalyst
+		elif "x86_64-apple-maccatalyst" == args.abi:
+			require_sysroot (args)
+			self.target = Target ("TARGET_AMD64", "TARGET_MACCAT", IOS_DEFINES)
+			self.target_args += ["-target", "x86_64-apple-ios13.5-macabi"]
+			self.target_args += ["-isysroot", args.sysroot]
+
+		elif "aarch64-apple-maccatalyst" == args.abi:
+			require_sysroot (args)
+			self.target = Target ("TARGET_ARM64", "TARGET_MACCAT", IOS_DEFINES)
+			self.target_args += ["-target", "arm64-apple-ios14.2-macabi"]
+			self.target_args += ["-isysroot", args.sysroot]
+
 		# watchOS
 		elif "armv7k-apple-darwin" == args.abi:
 			require_sysroot (args)

diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj
@@ -11,10 +11,12 @@
     <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+browser+'))">$(_MonoCrossAOTTargetOS)+browser+</_MonoCrossAOTTargetOS>
     <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+tvos+'))">$(_MonoCrossAOTTargetOS)+tvos+</_MonoCrossAOTTargetOS>
     <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+ios+'))">$(_MonoCrossAOTTargetOS)+ios+</_MonoCrossAOTTargetOS>
+    <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+maccatalyst+'))">$(_MonoCrossAOTTargetOS)+maccatalyst+</_MonoCrossAOTTargetOS>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+android+'))">$(MonoAotTargets);Android-x64;Android-arm64;Android-x86;Android-arm</MonoAotTargets>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+browser+'))">$(MonoAotTargets);Browser-wasm</MonoAotTargets>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+tvos+'))">$(MonoAotTargets);tvOSSimulator-x64;tvOSSimulator-arm64;tvOS-arm64</MonoAotTargets>
     <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+ios+'))">$(MonoAotTargets);iOSSimulator-x64;iOSSimulator-arm64;iOSSimulator-x86;iOS-arm64;iOS-arm</MonoAotTargets>
+    <MonoAotTargets Condition="$(_MonoCrossAOTTargetOS.contains('+maccatalyst+'))">$(MonoAotTargets);MacCatalyst-x64;MacCatalyst-arm64</MonoAotTargets>
   </PropertyGroup>
 
   <ItemGroup>