Enable building on arm64

Author: omajid

build-source-tarball.sh

@@ -12,6 +12,32 @@ if [ -z "${1:-}" ]; then
     exit 1
 fi
 
+# Use uname to determine what the CPU is.
+cpuname=$(uname -p)
+# Some Linux platforms report unknown for platform, but the arch for machine.
+if [[ "$cpuname" == "unknown" ]]; then
+  cpuname=$(uname -m)
+fi
+
+case $cpuname in
+  aarch64)
+    buildArch=arm64
+    ;;
+  amd64|x86_64)
+    buildArch=x64
+    ;;
+  armv7l)
+    buildArch=arm
+    ;;
+  i686)
+    buildArch=x86
+    ;;
+  *)
+    echo "Unknown CPU $cpuname detected, treating it as x64"
+    buildArch=x64
+    ;;
+esac
+
 TARBALL_ROOT=$1
 shift
 
@@ -199,28 +225,28 @@ cp $SCRIPT_ROOT/support/tarball/build.sh $TARBALL_ROOT/build.sh
 mkdir -p $TARBALL_ROOT/packages/prebuilt
 mkdir -p $TARBALL_ROOT/packages/source-built
 find $SCRIPT_ROOT/packages/restored/ -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
-find $SCRIPT_ROOT/bin/obj/x64/Release/nuget-packages -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
+find $SCRIPT_ROOT/bin/obj/$buildArch/Release/nuget-packages -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
 
 # Copy reference-packages from bin dir to reference-packages directory.
 # See corresponding change in dir.props to change ReferencePackagesBasePath conditionally in offline build.
 mkdir -p $TARBALL_ROOT/packages/reference
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/source $TARBALL_ROOT/packages/reference/source
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/staging $TARBALL_ROOT/packages/reference/staging
+cp -r $SCRIPT_ROOT/bin/obj/$buildArch/Release/reference-packages/source $TARBALL_ROOT/packages/reference/source
+cp -r $SCRIPT_ROOT/bin/obj/$buildArch/Release/reference-packages/staging $TARBALL_ROOT/packages/reference/staging
 
 # Copy tarballs to ./packages/archive directory
 mkdir -p $TARBALL_ROOT/packages/archive
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/external-tarballs/*.tar.gz $TARBALL_ROOT/packages/archive/
+cp -r $SCRIPT_ROOT/bin/obj/$buildArch/Release/external-tarballs/*.tar.gz $TARBALL_ROOT/packages/archive/
 
 # Copy generated source from bin to src/generatedSrc
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc
+cp -r $SCRIPT_ROOT/bin/obj/$buildArch/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc
 
 if [ -e $SCRIPT_ROOT/testing-smoke/smoke-test-packages ]; then
     cp -rf $SCRIPT_ROOT/testing-smoke/smoke-test-packages $TARBALL_ROOT/packages
 fi
 
 echo 'Removing source-built packages from tarball prebuilts...'
 
-for built_package in $(find $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
+for built_package in $(find $SCRIPT_ROOT/bin/obj/$buildArch/Release/blob-feed/packages/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
 do
     if [ -e $TARBALL_ROOT/packages/prebuilt/$(basename $built_package) ]; then
         rm $TARBALL_ROOT/packages/prebuilt/$(basename $built_package)
@@ -235,8 +261,8 @@ mkdir -p $TARBALL_ROOT/packages/source-built
 cp -r $SCRIPT_ROOT/Tools/source-built/coreclr-tools $TARBALL_ROOT/packages/source-built/
 
 # Setup package version props to include both source-built and running PackageVersions.props
-mkdir --parents $TARBALL_ROOT/bin/obj/x64/Release/
-cp $SCRIPT_ROOT/support/tarball/PackageVersions.props $TARBALL_ROOT/bin/obj/x64/Release/
+mkdir --parents $TARBALL_ROOT/bin/obj/$buildArch/Release/
+cp $SCRIPT_ROOT/support/tarball/PackageVersions.props $TARBALL_ROOT/bin/obj/$buildArch/Release/
 
 if [ $INCLUDE_LEAK_DETECTION -eq 1 ]; then
   echo 'Building leak detection MSBuild tasks...'
@@ -246,7 +272,7 @@ fi
 
 echo 'Removing reference-only packages from tarball prebuilts...'
 
-for ref_package in $(find $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/packages-to-delete/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
+for ref_package in $(find $SCRIPT_ROOT/bin/obj/$buildArch/Release/reference-packages/packages-to-delete/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
 do
     if [ -e $TARBALL_ROOT/packages/prebuilt/$(basename $ref_package) ]; then
         rm $TARBALL_ROOT/packages/prebuilt/$(basename $ref_package)
@@ -277,7 +303,7 @@ done
 echo 'Removing source-built, previously source-built packages and reference packages from il pkg src...'
 OLDIFS=$IFS
 
-allBuiltPkgs=(`ls $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*.nupkg | xargs -n1 basename | tr '[:upper:]' '[:lower:]'`)
+allBuiltPkgs=(`ls $SCRIPT_ROOT/bin/obj/$buildArch/Release/blob-feed/packages/*.nupkg | xargs -n1 basename | tr '[:upper:]' '[:lower:]'`)
 pushd $TARBALL_ROOT/packages/reference/staging/
 ilSrcPaths=(`find . -maxdepth 2 -mindepth 2`)
 popd

dir.props

@@ -2,6 +2,9 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition="$(Configuration) == ''">Release</Configuration>
+
+    <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
+    <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
     <!-- true if we have bootstrapped buildtools (usually on an unsupported platform -->

patches/aspnetcore/aspnetcore-arm64.patch

@@ -0,0 +1,109 @@
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 2ef491a409..8e699a2d93 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -105,6 +105,8 @@
+     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
+     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
+     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
++    <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
++    <TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</TargetArchitecture>
+     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
+     <TargetRuntimeIdentifier>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
+ 
+diff --git a/build.sh b/build.sh
+index 05e1628368..bbb79aea08 100755
+--- a/build.sh
++++ b/build.sh
+@@ -13,7 +13,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ target_os_name=''
+ ci=false
+ use_default_binary_log=false
+-verbosity='minimal'
++verbosity='detailed'
+ run_restore=''
+ run_build=true
+ run_pack=false
+@@ -27,7 +27,7 @@ build_nodejs=''
+ build_java=''
+ build_installers=''
+ build_projects=''
+-target_arch='x64'
++target_arch=''
+ configuration=''
+ 
+ if [ "$(uname)" = "Darwin" ]; then
+@@ -96,6 +96,21 @@ __warn() {
+ # main
+ #
+ 
++case "$(uname -m)" in
++    aarch64)
++        target_arch='arm64'
++        ;;
++    armv7l)
++        target_arch='arm'
++        ;;
++    i686)
++        target_arch='x86'
++        ;;
++    x86_64)
++        target_arch='x64'
++        ;;
++esac
++
+ while [[ $# -gt 0 ]]; do
+     opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
+     case "$opt" in
+diff --git a/global.json b/global.json
+index b0204615a6..ddc97517fe 100644
+--- a/global.json
++++ b/global.json
+@@ -5,10 +5,7 @@
+   "tools": {
+     "dotnet": "3.0.100-preview8-013656",
+     "runtimes": {
+-      "dotnet/x64": [
+-        "$(MicrosoftNETCoreAppRuntimeVersion)"
+-      ],
+-      "dotnet/x86": [
++      "dotnet": [
+         "$(MicrosoftNETCoreAppRuntimeVersion)"
+       ]
+     },
+diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+index 4c4298a92d..5364a02af7 100644
+--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
++++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+@@ -90,15 +90,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant
+     <PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
+     <PathSeparator Condition=" '$(TargetOsName)' == 'win' ">%3B</PathSeparator>
+ 
++    <CrossCompileDirectory Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm' ">x64_arm</CrossCompileDirectory>
++    <CrossCompileDirectory Condition=" '$(TargetArchitecture)' == 'arm64' AND '$(BuildArchitecture)' != 'arm64' ">x64_arm64</CrossCompileDirectory>
++    <CrossCompileDirectory Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm</CrossCompileDirectory>
++
+     <!-- Crossgen executable name -->
+     <CrossgenToolFileName>crossgen</CrossgenToolFileName>
+     <CrossgenToolFileName Condition=" '$(TargetOsName)' == 'win' ">$(CrossgenToolFileName).exe</CrossgenToolFileName>
+     <!-- Default crossgen executable relative path -->
+     <CrossgenToolPackagePath>$(CrossgenToolFileName)</CrossgenToolPackagePath>
+     <!-- Disambiguated RID-specific crossgen executable relative path -->
+-    <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm' ">x64_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
+-    <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
+-    <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
++    <CrossgenToolPackagePath Condition=" '$(CrossComipleDirectory)' != '' ">$(CrossCompileDirectory)\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
+ 
+     <RuntimePackageRoot>$([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)'))</RuntimePackageRoot>
+     <RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
+@@ -293,7 +295,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
+   -->
+   <PropertyGroup>
+     <CrossgenToolDir>$(IntermediateOutputPath)crossgen\</CrossgenToolDir>
+-    <CoreCLRJitPath>$(CrossgenToolDir)$(LibPrefix)clrjit$(LibExtension)</CoreCLRJitPath>
++    <!-- <CoreCLRJitPath>$(RuntimePackageRoot)runtimes\$(LibPrefix)clrjit$(LibExtension)</CoreCLRJitPath> -->
++    <CoreCLRJitPath Condition="'$(CrossCompileDirectory)' == ''">$(RuntimePackageRoot)runtimes\$(RuntimeIdentifier)\native\$(LibPrefix)clrjit$(LibExtension)</CoreCLRJitPath>
++    <CoreCLRJitPath Condition="'$(CrossCompileDirectory)' != ''">$(RuntimepackageRoot)runtimes\$(CrossCompileDirectory)\native\$(LibPrefix)clrjit$(LibraryFileExtension)</CoreCLRJitPath>
+   </PropertyGroup>
+ 
+   <ItemGroup>

patches/core-sdk/0001-Enable-building-on-arm64-machines.patch

@@ -0,0 +1,116 @@
+From 4b5c617203cfb9d2c1b12995e12d819fba6d7b6f Mon Sep 17 00:00:00 2001
+From: Omair Majid <[email protected]>
+Date: Tue, 8 Oct 2019 17:02:29 -0400
+Subject: [PATCH] Enable building on arm64 machines
+
+With this commit, I can build core-sdk on RHEL 8 on arm64 directly,
+without cross compilation.
+
+Bump the sourcelink version to pick up the ability to parse git info
+without depending on libgit2sharp. This allows sourcelink to work on
+arm64. The version is the same as the one recently added to core-setup:
+https://github.com/dotnet/core-setup/pull/7696
+
+Introduce a new 'BuildArchitecture' msbuild property that contains the host
+architecture (arm64, x64, etc). This is the architecture of the
+currently running machine, and may be different from the architecture we
+are targetting in the case of cross compilation.
+
+There's a gotcha with BuildArchitecture: under Visual Studio (an x86) process,
+we generally want a x64 architecture. So try and restrict it to arm64 only.
+
+Use BuildArchitecture to determine whether _crossDir and LibCLRJitRid need to
+be special-cased for arm64 or or not.
+---
+ Directory.Build.props                            | 6 ++++++
+ eng/Versions.props                               | 2 +-
+ src/redist/targets/Crossgen.targets              | 6 +++---
+ src/redist/targets/GenerateLayout.targets        | 4 ++--
+ src/redist/targets/GetRuntimeInformation.targets | 1 -
+ 5 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index b65a72410..be3834859 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -7,6 +7,12 @@
+     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+   </PropertyGroup>
+ 
++  <PropertyGroup>
++    <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
++    <Architecture Condition="'$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Architecture>
++    <Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
++  </PropertyGroup>
++
+   <PropertyGroup>
+     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+     <DebugType>embedded</DebugType>
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 344a325bf..37e478e72 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -87,7 +87,7 @@
+     <VersionToolsVersion>$(BuildTasksFeedToolVersion)</VersionToolsVersion>
+     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
+     <MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
+-    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
++    <MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
+diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
+index 8d3091307..931dff2d9 100644
+--- a/src/redist/targets/Crossgen.targets
++++ b/src/redist/targets/Crossgen.targets
+@@ -5,14 +5,14 @@
+     
+     <PropertyGroup>
+       <RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
+-      <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64</_crossDir>
++      <_crossDir Condition="'$(Architecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64'">/x64_arm64</_crossDir>
+       <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm</_crossDir>
+       <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm</_crossDir>
+       <CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath>
+-      <LibCLRJitRid Condition="!$(Architecture.StartsWith('arm'))">$(SharedFrameworkRid)</LibCLRJitRid>
+-      <LibCLRJitRid Condition="'$(Architecture)' == 'arm64'">x64_arm64</LibCLRJitRid>
++      <LibCLRJitRid Condition="'$(Architecture)' == 'arm64' and '$(BuildArchitecture)' == 'x64'">x64_arm64</LibCLRJitRid>
+       <LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">x86_arm</LibCLRJitRid>
+       <LibCLRJitRid Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">x64_arm</LibCLRJitRid>
++      <LibCLRJitRid Condition="'$(LibCLRJitRid)' == ''">$(SharedFrameworkRid)</LibCLRJitRid>
+       <LibCLRJitPath>$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
+       <SharedFrameworkNameVersionPath>$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</SharedFrameworkNameVersionPath>
+       <DIASymReaderCrossgenFilter>*</DIASymReaderCrossgenFilter>
+diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
+index d2a0b6fd1..a0bcf6f35 100644
+--- a/src/redist/targets/GenerateLayout.targets
++++ b/src/redist/targets/GenerateLayout.targets
+@@ -25,11 +25,11 @@
+ 
+       <!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
+       <SharedFrameworkInstallerFileRid>$(CoreSetupRid)</SharedFrameworkInstallerFileRid>
+-      <SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">x64</SharedFrameworkInstallerFileRid>
++      <SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(Architecture)</SharedFrameworkInstallerFileRid>
+ 
+       <!-- Use the "x64" Rid when downloading Linux runtime dependencies Debian package. -->
+       <RuntimeDepsInstallerFileRid>$(CoreSetupRid)</RuntimeDepsInstallerFileRid>
+-      <RuntimeDepsInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">x64</RuntimeDepsInstallerFileRid>
++      <RuntimeDepsInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">$(Architecture)</RuntimeDepsInstallerFileRid>
+ 
+       <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
+       <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
+diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
+index 3b14d1203..f49c7262f 100644
+--- a/src/redist/targets/GetRuntimeInformation.targets
++++ b/src/redist/targets/GetRuntimeInformation.targets
+@@ -13,7 +13,6 @@
+       <OSName Condition=" '$(OSName)' == '' AND '$(IsLinux)' == 'True' ">linux</OSName>
+       <OSPlatform Condition=" '$(OSPlatform)' == '' AND '$(IsLinux)' == 'True' ">linux</OSPlatform>
+ 
+-      <Architecture Condition=" '$(Architecture)' == '' ">x64</Architecture>
+       <Rid Condition=" '$(Rid)' == '' ">$(OSName)-$(Architecture)</Rid>
+     </PropertyGroup>
+     
+-- 
+2.18.1
+