From 923fd5de4445f4554db18dcd252d52f2d615a0f3 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 19 Jan 2023 17:47:10 +0000
Subject: [PATCH 1/2] Target lower glibc for Linux arm64

---
 eng/pipelines/common/templates/pipeline-with-resources.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml
index 71048418f0493a..c6e9c96a3eed33 100644
--- a/eng/pipelines/common/templates/pipeline-with-resources.yml
+++ b/eng/pipelines/common/templates/pipeline-with-resources.yml
@@ -15,9 +15,9 @@ resources:
         ROOTFS_DIR: /crossrootfs/armv6
 
     - container: linux_arm64
-      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-arm64
       env:
-        ROOTFS_DIR: /crossrootfs/arm64
+        ROOTFS_DIR: /crossrootfs
 
     - container: linux_musl_x64
       image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode

From 2673d229e2889fb1e5e9c25e778be0edde4d1e7d Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 26 Jan 2023 22:47:49 +0000
Subject: [PATCH 2/2] Set prefix for mono

---
 src/mono/mono.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index b4289a0b76f8b0..c5d158e9237621 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -711,6 +711,7 @@
       <MonoAotAbi>aarch64-linux-gnu</MonoAotAbi>
       <MonoAotOffsetsFile>$(MonoObjCrossDir)offsets-aarch-linux-gnu.h</MonoAotOffsetsFile>
       <MonoAotOffsetsPrefix>$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/7</MonoAotOffsetsPrefix>
+      <MonoAotOffsetsPrefix Condition="'$(Platform)' == 'arm64'">$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/5</MonoAotOffsetsPrefix>
     </PropertyGroup>
 
     <!-- macOS host specific options -->